From edc587ccf2abff91c23a8c11f0cab88bdbaa29c9 Mon Sep 17 00:00:00 2001
From: "Joel Davies (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Fri, 20 Mar 2026 08:57:17 +0000
Subject: [PATCH] Fix distance rate auto-selection when submitting from Self DM
 to workspace

Add targeted guard to the auto-rate-update effect so that it blocks when
isMovingTransactionFromTrackExpense is true AND customUnitRateID is
FAKE_P2P_ID (submit-to-workspace flow), but allows when customUnitRateID
is '-1' (upgrade/new-rate-creation flow). This preserves the fix from
PR #84850 for issue #82629 while restoring the correct "Rate not valid"
validation error for the Self DM submission flow.

Co-authored-by: Joel Davies <jjcoffee@users.noreply.github.com>
---
 src/components/MoneyRequestConfirmationList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index feb75bfef566c..2fd0c4203321e 100644
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -709,7 +709,7 @@ function MoneyRequestConfirmationList({
             !isPolicyExpenseChat ||
             !transactionID ||
             !lastSelectedRate ||
-            isMovingTransactionFromTrackExpense ||
+            (isMovingTransactionFromTrackExpense && customUnitRateID === CONST.CUSTOM_UNITS.FAKE_P2P_ID) ||
             !selectedParticipants.some((participant) => participant.policyID === policy?.id)
         ) {
             return;