Merge pull request Expensify#63539 from nkdengineer/fix/62368

fix: paying elsewhere and cancelling payment gets button reset

Author: youssef-lr

src/hooks/usePaymentOptions.ts

@@ -72,7 +72,10 @@ function usePaymentOptions({
             if (typeof paymentMethod?.[policyIDKey] === 'string') {
                 return paymentMethod?.[policyIDKey];
             }
-            return (paymentMethod?.[policyIDKey] as LastPaymentMethodType)?.lastUsed;
+            if (typeof (paymentMethod?.[policyIDKey] as LastPaymentMethodType)?.lastUsed === 'string') {
+                return (paymentMethod?.[policyIDKey] as LastPaymentMethodType).lastUsed;
+            }
+            return (paymentMethod?.[policyIDKey] as LastPaymentMethodType)?.lastUsed.name;
         },
     });
 

src/libs/actions/IOU.ts

@@ -10965,7 +10965,7 @@ function checkIfScanFileCanBeRead(
 
 /** Save the preferred payment method for a policy */
 function savePreferredPaymentMethod(policyID: string, paymentMethod: PaymentMethodType, type: ValueOf<typeof CONST.LAST_PAYMENT_METHOD> | undefined) {
-    Onyx.merge(`${ONYXKEYS.NVP_LAST_PAYMENT_METHOD}`, {[policyID]: type ? {[type]: paymentMethod, [CONST.LAST_PAYMENT_METHOD.LAST_USED]: paymentMethod} : paymentMethod});
+    Onyx.merge(`${ONYXKEYS.NVP_LAST_PAYMENT_METHOD}`, {[policyID]: type ? {[type]: paymentMethod, [CONST.LAST_PAYMENT_METHOD.LAST_USED]: {name: paymentMethod}} : paymentMethod});
 }
 
 /** Get report policy id of IOU request */

src/libs/actions/Search.ts

@@ -77,7 +77,7 @@ function getLastPolicyPaymentMethod(policyID: string | undefined, lastPaymentMet
     if (typeof lastPaymentMethods?.[policyID] === 'string') {
         lastPolicyPaymentMethod = lastPaymentMethods?.[policyID] as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
     } else {
-        lastPolicyPaymentMethod = (lastPaymentMethods?.[policyID] as LastPaymentMethodType)?.lastUsed as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
+        lastPolicyPaymentMethod = (lastPaymentMethods?.[policyID] as LastPaymentMethodType)?.lastUsed.name as ValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
     }
 
     return lastPolicyPaymentMethod;

src/types/onyx/LastPaymentMethod.ts

@@ -3,13 +3,25 @@
  */
 type LastPaymentMethodType = {
     /** The default last payment method */
-    lastUsed: string;
+    lastUsed: {
+        /** The name of the last payment method */
+        name: string;
+    };
     /** The lastPaymentMethod of an IOU */
-    Iou: string;
+    Iou: {
+        /** The name of the last payment method */
+        name: string;
+    };
     /** The lastPaymentMethod of an Expense */
-    Expense: string;
+    Expense: {
+        /** The name of the last payment method */
+        name: string;
+    };
     /** The lastPaymentMethod of an Invoice */
-    Invoice: string;
+    Invoice: {
+        /** The name of the last payment method */
+        name: string;
+    };
 };
 
 /** Record of last payment methods, indexed by policy id */