From 162f9dffc2328afd0a2f2a554ca356304d70f31a Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Fri, 26 Jul 2024 19:57:45 +0200
Subject: [PATCH 01/10] add translations

---
 src/languages/en.ts | 1 +
 src/languages/es.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1cb58198425f..554d51771ddc 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4153,6 +4153,7 @@ export default {
             changeCurrency: 'Change payment currency',
             cardNotFound: 'No payment card added',
             retryPaymentButton: 'Retry payment',
+            authenticatePayment: 'Authenticate payment',
             requestRefund: 'Request refund',
             requestRefundModal: {
                 phrase1: 'Getting a refund is easy, just downgrade your account before your next billing date and you’ll receive a refund.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 92936b6371ee..7657aef1b6da 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4676,6 +4676,7 @@ export default {
             changeCurrency: 'Cambiar moneda de pago',
             cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
             retryPaymentButton: 'Reintentar el pago',
+            authenticatePayment: 'Autenticar el pago',
             requestRefund: 'Solicitar reembolso',
             requestRefundModal: {
                 phrase1: 'Obtener un reembolso es fácil, simplemente baja tu cuenta de categoría antes de la próxima fecha de facturación y recibirás un reembolso.',

From fdb3a16dc808feb69d2a73504e17318972da76e0 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Fri, 26 Jul 2024 19:58:50 +0200
Subject: [PATCH 02/10] add authenticate button

---
 .../Subscription/CardSection/CardSection.tsx       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index 049728a85614..df3c6809e1de 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -70,6 +70,10 @@ function CardSection() {
         Subscription.clearOutstandingBalance();
     };
 
+    const handleAuthenticatePayment = () => {
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    };
+
     const handleBillingBannerClose = () => {
         setBillingStatus(undefined);
     };
@@ -140,6 +144,16 @@ function CardSection() {
                         large
                     />
                 )}
+                {billingStatus?.isAuthenticationRequired !== undefined && (
+                    <Button
+                        text={translate('subscription.cardSection.authenticatePayment')}
+                        isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
+                        isLoading={subscriptionRetryBillingStatusPending}
+                        onPress={handleAuthenticatePayment}
+                        style={[styles.w100, styles.mt5]}
+                        large
+                    />
+                )}
 
                 {!!account?.hasPurchases && (
                     <MenuItem

From d37081085e825b4b3f29d5f1b9f0bb0f6d8c1165 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 29 Jul 2024 14:21:28 +0200
Subject: [PATCH 03/10] updated banner

---
 src/libs/SubscriptionUtils.ts                               | 3 ++-
 src/pages/settings/Subscription/CardSection/CardSection.tsx | 5 +++--
 src/pages/settings/Subscription/CardSection/utils.ts        | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 0cc4e05f7b29..4d640f0505cc 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -175,7 +175,7 @@ function hasAmountOwed(): boolean {
  * @returns Whether there is a card authentication error.
  */
 function hasCardAuthenticatedError() {
-    return stripeCustomerId?.status === 'authentication_required' && amountOwed === 0;
+    return stripeCustomerId?.status === 'authentication_required' && getAmountOwed() === 0;
 }
 
 /**
@@ -458,6 +458,7 @@ export {
     getAmountOwed,
     getOverdueGracePeriodDate,
     getCardForSubscriptionBilling,
+    hasCardAuthenticatedError,
     hasSubscriptionGreenDotInfo,
     hasRetryBillingError,
     PAYMENT_STATUS,
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index df3c6809e1de..8973a0886be7 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -85,7 +85,8 @@ function CardSection() {
         BillingBanner = <TrialStartedBillingBanner />;
     } else if (SubscriptionUtils.hasUserFreeTrialEnded()) {
         BillingBanner = <TrialEndedBillingBanner />;
-    } else if (billingStatus) {
+    }
+    if (billingStatus) {
         BillingBanner = (
             <SubscriptionBillingBanner
                 title={billingStatus.title}
@@ -144,7 +145,7 @@ function CardSection() {
                         large
                     />
                 )}
-                {billingStatus?.isAuthenticationRequired !== undefined && (
+                {SubscriptionUtils.hasCardAuthenticatedError() && (
                     <Button
                         text={translate('subscription.cardSection.authenticatePayment')}
                         isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
index 48999f1bb7cb..e97773eb82a1 100644
--- a/src/pages/settings/Subscription/CardSection/utils.ts
+++ b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -28,7 +28,7 @@ function getBillingStatus(
 
     const amountOwed = SubscriptionUtils.getAmountOwed();
 
-    const subscriptionStatus = SubscriptionUtils.getSubscriptionStatus();
+    const subscriptionStatus = SubscriptionUtils.PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED;
 
     const endDate = SubscriptionUtils.getOverdueGracePeriodDate();
 
@@ -36,7 +36,7 @@ function getBillingStatus(
 
     const isCurrentCardExpired = DateUtils.isCardExpired(accountData?.cardMonth ?? 0, accountData?.cardYear ?? 0);
 
-    switch (subscriptionStatus?.status) {
+    switch (subscriptionStatus) {
         case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED:
             return {
                 title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),

From 35af9345b24e372bf6c9bc1a5ecca053b3419f0a Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 29 Jul 2024 14:26:53 +0200
Subject: [PATCH 04/10] fix ts

---
 src/pages/settings/Subscription/CardSection/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
index e97773eb82a1..48999f1bb7cb 100644
--- a/src/pages/settings/Subscription/CardSection/utils.ts
+++ b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -28,7 +28,7 @@ function getBillingStatus(
 
     const amountOwed = SubscriptionUtils.getAmountOwed();
 
-    const subscriptionStatus = SubscriptionUtils.PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED;
+    const subscriptionStatus = SubscriptionUtils.getSubscriptionStatus();
 
     const endDate = SubscriptionUtils.getOverdueGracePeriodDate();
 
@@ -36,7 +36,7 @@ function getBillingStatus(
 
     const isCurrentCardExpired = DateUtils.isCardExpired(accountData?.cardMonth ?? 0, accountData?.cardYear ?? 0);
 
-    switch (subscriptionStatus) {
+    switch (subscriptionStatus?.status) {
         case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED:
             return {
                 title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),

From 235604fd79ee8602976768734d9688c0a975d1d0 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Thu, 1 Aug 2024 18:50:03 +0200
Subject: [PATCH 05/10] dont remove link on moda close, only on payment success

---
 .../Subscription/CardAuthenticationModal/index.tsx   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
index 80cde4cb862c..f4be7c299302 100644
--- a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -22,9 +22,10 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
     const [isLoading, setIsLoading] = useState(true);
+    const [isVisible, setIsVisible] = useState(false);
 
     const onModalClose = () => {
-        PaymentMethods.clearPaymentCard3dsVerification();
+        setIsVisible(false);
     };
 
     useEffect(() => {
@@ -35,6 +36,13 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION);
     }, [privateStripeCustomerID]);
 
+    useEffect(() => {
+        if (!authenticationLink) {
+            return;
+        }
+        setIsVisible(!!authenticationLink);
+    }, [authenticationLink]);
+
     const handleGBPAuthentication = useCallback(
         (event: MessageEvent<string>) => {
             const message = event.data;
@@ -56,7 +64,7 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     return (
         <Modal
             type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
-            isVisible={!!authenticationLink}
+            isVisible={isVisible}
             onClose={onModalClose}
             onModalHide={onModalClose}
         >

From c190cd316c84323764439dd4715a9e2d5cf5ae1f Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 01:44:37 +0200
Subject: [PATCH 06/10] fixed 3ds flow, rerender fix

---
 src/CONST.ts                                        |  1 +
 .../Subscription/CardAuthenticationModal/index.tsx  | 13 +++----------
 .../Subscription/CardSection/CardSection.tsx        |  6 +++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 73c9bf605b47..b16ee7f37fe6 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -3888,6 +3888,7 @@ const CONST = {
     },
     STRIPE_GBP_AUTH_STATUSES: {
         SUCCEEDED: 'succeeded',
+        CARD_AUTHENTICATION_REQUIRED: 'authentication_required',
     },
     TAB: {
         NEW_CHAT_TAB_ID: 'NewChatTab',
diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
index f4be7c299302..b6dee7ee82a5 100644
--- a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -20,21 +20,14 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
     const styles = useThemeStyles();
     const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
     const [session] = useOnyx(ONYXKEYS.SESSION);
-    const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
     const [isLoading, setIsLoading] = useState(true);
     const [isVisible, setIsVisible] = useState(false);
 
-    const onModalClose = () => {
+    const onModalClose = useCallback(() => {
         setIsVisible(false);
-    };
-
-    useEffect(() => {
-        if (privateStripeCustomerID?.status !== CONST.STRIPE_GBP_AUTH_STATUSES.SUCCEEDED) {
-            return;
-        }
         PaymentMethods.clearPaymentCard3dsVerification();
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION);
-    }, [privateStripeCustomerID]);
+    }, []);
 
     useEffect(() => {
         if (!authenticationLink) {
@@ -51,7 +44,7 @@ function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
                 onModalClose();
             }
         },
-        [session?.accountID],
+        [onModalClose, session?.accountID],
     );
 
     useEffect(() => {
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index e6f0397a7cdf..cfa4aa53c9f5 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -18,6 +18,7 @@ import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPaymentMethodDescription} from '@libs/PaymentUtils';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as Subscription from '@userActions/Subscription';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -40,6 +41,8 @@ function CardSection() {
     const theme = useTheme();
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
     const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
     const subscriptionPlan = useSubscriptionPlan();
     const [subscriptionRetryBillingStatusPending] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING);
@@ -64,13 +67,14 @@ function CardSection() {
 
     useEffect(() => {
         setBillingStatus(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));
-    }, [subscriptionRetryBillingStatusPending, subscriptionRetryBillingStatusSuccessful, subscriptionRetryBillingStatusFailed, translate, defaultCard?.accountData]);
+    }, [subscriptionRetryBillingStatusPending, subscriptionRetryBillingStatusSuccessful, subscriptionRetryBillingStatusFailed, translate, defaultCard?.accountData, privateStripeCustomerID]);
 
     const handleRetryPayment = () => {
         Subscription.clearOutstandingBalance();
     };
 
     const handleAuthenticatePayment = () => {
+        PaymentMethods.verifySetupIntent(session?.accountID ?? -1, false);
         Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
     };
 

From 992125194d378c13e1cb04842d18ff4df7531b51 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 01:57:10 +0200
Subject: [PATCH 07/10] add wait for verifyIntent

---
 .../settings/Subscription/CardSection/CardSection.tsx  | 10 ++++++++--
 .../settings/Subscription/SubscriptionSettingsPage.tsx |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index cfa4aa53c9f5..48caeed2bb96 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -42,6 +42,7 @@ function CardSection() {
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
     const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
+    const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
     const subscriptionPlan = useSubscriptionPlan();
@@ -50,7 +51,6 @@ function CardSection() {
     const [subscriptionRetryBillingStatusFailed] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED);
     const {isOffline} = useNetwork();
     const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);
-
     const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);
 
     const requestRefund = useCallback(() => {
@@ -73,9 +73,15 @@ function CardSection() {
         Subscription.clearOutstandingBalance();
     };
 
+    useEffect(() => {
+        if (!authenticationLink || privateStripeCustomerID?.status !== CONST.STRIPE_GBP_AUTH_STATUSES.CARD_AUTHENTICATION_REQUIRED) {
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    }, [authenticationLink, privateStripeCustomerID?.status]);
+
     const handleAuthenticatePayment = () => {
         PaymentMethods.verifySetupIntent(session?.accountID ?? -1, false);
-        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
     };
 
     const handleBillingBannerClose = () => {
diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index c6112ec19c8d..1694c6e3923d 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -27,9 +27,9 @@ function SubscriptionSettingsPage() {
         Subscription.openSubscriptionPage();
     }, []);
 
-    if (!subscriptionPlan) {
-        return <NotFoundPage />;
-    }
+    // if (!subscriptionPlan) {
+    //     return <NotFoundPage />;
+    // }
 
     return (
         <ScreenWrapper

From 6b68eaf1e446345f94eeba99d5eec1ffc03e7008 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 6 Aug 2024 21:57:21 +0200
Subject: [PATCH 08/10] remove lint error

---
 .../settings/Subscription/SubscriptionSettingsPage.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index 1694c6e3923d..c6112ec19c8d 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -27,9 +27,9 @@ function SubscriptionSettingsPage() {
         Subscription.openSubscriptionPage();
     }, []);
 
-    // if (!subscriptionPlan) {
-    //     return <NotFoundPage />;
-    // }
+    if (!subscriptionPlan) {
+        return <NotFoundPage />;
+    }
 
     return (
         <ScreenWrapper

From 6616b24fc77a41f8bacbbf3f0adbf45a686ae140 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Mon, 19 Aug 2024 19:50:54 +0200
Subject: [PATCH 09/10] remove sideeffects

---
 src/libs/API/types.ts              |  2 --
 src/libs/actions/PaymentMethods.ts | 18 +++---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index cc3504ad89ab..364984d526a2 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -798,7 +798,6 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
     OPEN_REPORT: 'OpenReport',
     RECONNECT_APP: 'ReconnectApp',
-    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
     REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
     SWITCH_TO_OLD_DOT: 'SwitchToOldDot',
     TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
@@ -815,7 +814,6 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
-    [SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
     [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
 };
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index bac3739af810..e7a01ccb2d04 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -13,7 +13,7 @@ import type {
     TransferWalletBalanceParams,
     UpdateBillingCurrencyParams,
 } from '@libs/API/parameters';
-import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
@@ -254,22 +254,10 @@ function addSubscriptionPaymentCard(cardData: {
     ];
 
     if (currency === CONST.PAYMENT_CARD_CURRENCY.GBP) {
-        // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData}).then((response) => {
-            if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                return;
-            }
-
-            // We are using this onyx key to open Modal and preview iframe. Potentially we can save the whole object which come from side effect
-            Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, (response as {authenticationLink: string}).authenticationLink);
-        });
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData});
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {
-            optimisticData,
-            successData,
-            failureData,
-        });
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {optimisticData, successData, failureData});
     }
 }
 

From 3b6fdfdc4d1cacef9ac99aed8a39c0c207cf1e77 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Tue, 20 Aug 2024 13:10:17 +0200
Subject: [PATCH 10/10] revert remove sideeffects commit

---
 src/libs/API/types.ts              |  2 ++
 src/libs/actions/PaymentMethods.ts | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 364984d526a2..cc3504ad89ab 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -798,6 +798,7 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
     OPEN_REPORT: 'OpenReport',
     RECONNECT_APP: 'ReconnectApp',
+    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
     REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
     SWITCH_TO_OLD_DOT: 'SwitchToOldDot',
     TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
@@ -814,6 +815,7 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
     [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
 };
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index e7a01ccb2d04..bac3739af810 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -13,7 +13,7 @@ import type {
     TransferWalletBalanceParams,
     UpdateBillingCurrencyParams,
 } from '@libs/API/parameters';
-import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
@@ -254,10 +254,22 @@ function addSubscriptionPaymentCard(cardData: {
     ];
 
     if (currency === CONST.PAYMENT_CARD_CURRENCY.GBP) {
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData});
+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData}).then((response) => {
+            if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                return;
+            }
+
+            // We are using this onyx key to open Modal and preview iframe. Potentially we can save the whole object which come from side effect
+            Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, (response as {authenticationLink: string}).authenticationLink);
+        });
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {optimisticData, successData, failureData});
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {
+            optimisticData,
+            successData,
+            failureData,
+        });
     }
 }