Merge pull request #55825 from ikevin127/ikevin127-paymentCurrencyOny…

…xCache Fix currency selected incorrectly after page reload
Expensify · Jan 29, 2025 · 242b4c9 · 242b4c9
2 parents 3cfb4fe + bd1341a
commit 242b4c9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/AddPaymentCard/PaymentCardForm.tsx b/src/components/AddPaymentCard/PaymentCardForm.tsx
@@ -24,6 +24,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/AddPaymentCardForm';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 type PaymentCardFormProps = {
     shouldShowPaymentCardForm?: boolean;
@@ -132,7 +133,7 @@ function PaymentCardForm({
     currencySelectorRoute,
 }: PaymentCardFormProps) {
     const styles = useThemeStyles();
-    const [data] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
+    const [data, metadata] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
 
     const {translate} = useLocalize();
     const route = useRoute();
@@ -204,7 +205,7 @@ function PaymentCardForm({
         setCardNumber(validCardNumber);
     }, []);
 
-    if (!shouldShowPaymentCardForm) {
+    if (!shouldShowPaymentCardForm || isLoadingOnyxValue(metadata)) {
         return null;
     }