Merge pull request #38962 from barros001/fix/38889

Expensify · Mar 26, 2024 · 6571b37 · 6571b37
2 parents fed9d6c + c250643
commit 6571b37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx
@@ -76,7 +76,7 @@ function ButtonWithDropdownMenu<IValueType>({
                         ref={buttonRef}
                         onPress={(event) => onPress(event, selectedItem.value)}
                         text={customText ?? selectedItem.text}
-                        isDisabled={isDisabled}
+                        isDisabled={isDisabled || !!selectedItem.disabled}
                         isLoading={isLoading}
                         shouldRemoveRightBorderRadius
                         style={[styles.flex1, styles.pr0]}

diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
@@ -203,7 +203,7 @@ function SettlementButton({
         return buttonOptions;
         // We don't want to reorder the options when the preferred payment method changes while the button is still visible
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [currency, formattedAmount, iouReport, policyID, translate, shouldHidePaymentOptions, shouldShowApproveButton]);
+    }, [currency, formattedAmount, iouReport, policyID, translate, shouldHidePaymentOptions, shouldShowApproveButton, shouldDisableApproveButton]);
     const selectPaymentType = (event: KYCFlowEvent, iouPaymentType: PaymentMethodType, triggerKYCFlow: TriggerKYCFlow) => {
         if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
             triggerKYCFlow(event, iouPaymentType);