use the new route for buy - fix deeplinks

Gamboster · Gamboster · commit b500bbbdaa82 · 2025-10-09T18:28:23.000-03:00
diff --git a/src/components/modal/transact-menu/TransactMenu.tsx b/src/components/modal/transact-menu/TransactMenu.tsx
@@ -18,10 +18,10 @@ import SheetModal from '../base/sheet/SheetModal';
 import Icons from './TransactMenuIcons';
 import {useTranslation} from 'react-i18next';
 import {useAppDispatch, useAppSelector} from '../../../utils/hooks';
-import {WalletScreens} from '../../../navigation/wallet/WalletGroup';
 import {Analytics} from '../../../store/analytics/analytics.effects';
 import {sleep} from '../../../utils/helper-methods';
 import {css} from 'styled-components/native';
+import {ExternalServicesScreens} from '../../../navigation/services/ExternalServicesGroup';
 
 const TransactButton = styled.View`
   justify-content: center;
@@ -136,12 +136,7 @@ const TransactModal = () => {
             context: 'TransactMenu',
           }),
         );
-        navigation.navigate(WalletScreens.AMOUNT, {
-          onAmountSelected: async (amount: string, setButtonState: any) => {
-            navigation.navigate('BuyCryptoRoot', {
-              amount: Number(amount),
-            });
-          },
+        navigation.navigate(ExternalServicesScreens.ROOT_BUY_AND_SELL, {
           context: 'buyCrypto',
         });
       },
diff --git a/src/navigation/services/components/externalServicesOfferSelector.tsx b/src/navigation/services/components/externalServicesOfferSelector.tsx
@@ -374,6 +374,49 @@ const ExternalServicesOfferSelector: React.FC<
     _paymentMethod,
   );
 
+  BuyCryptoSupportedExchanges.forEach((exchange: BuyCryptoExchangeKey) => {
+    if (offersDefault[exchange]) {
+      offersDefault[exchange].fiatCurrency = getAvailableFiatCurrencies(
+        exchange,
+      ).includes(fiatCurrency)
+        ? fiatCurrency
+        : 'USD';
+
+      if (paymentMethod) {
+        if (
+          preSetPartner &&
+          BuyCryptoSupportedExchanges.includes(preSetPartner)
+        ) {
+          offersDefault[exchange].showOffer =
+            preSetPartner === exchange
+              ? isPaymentMethodSupported(
+                  preSetPartner,
+                  paymentMethod,
+                  coin,
+                  chain,
+                  offersDefault[preSetPartner].fiatCurrency,
+                  country,
+                ) &&
+                (!buyCryptoConfig?.[preSetPartner] ||
+                  !buyCryptoConfig?.[preSetPartner]?.removed)
+              : false;
+        } else {
+          offersDefault[exchange].showOffer =
+            isPaymentMethodSupported(
+              exchange,
+              paymentMethod,
+              coin,
+              chain,
+              offersDefault[exchange].fiatCurrency,
+              country,
+            ) &&
+            (!buyCryptoConfig?.[exchange] ||
+              !buyCryptoConfig?.[exchange]?.removed);
+        }
+      }
+    }
+  });
+
   const [offers, setOffers] = useState(cloneDeep(offersDefault));
   const [selectedOffer, setSelectedOffer] = useState<CryptoOffer | undefined>();
   const [selectedOfferLoading, setSelectedOfferLoading] =
@@ -1462,49 +1505,6 @@ const ExternalServicesOfferSelector: React.FC<
   };
 
   const getBuyCryptoQuotes = (selectedWallet: Wallet) => {
-    BuyCryptoSupportedExchanges.forEach((exchange: BuyCryptoExchangeKey) => {
-      if (offersDefault[exchange]) {
-        offersDefault[exchange].fiatCurrency = getAvailableFiatCurrencies(
-          exchange,
-        ).includes(fiatCurrency)
-          ? fiatCurrency
-          : 'USD';
-
-        if (paymentMethod) {
-          if (
-            preSetPartner &&
-            BuyCryptoSupportedExchanges.includes(preSetPartner)
-          ) {
-            offersDefault[exchange].showOffer =
-              preSetPartner === exchange
-                ? isPaymentMethodSupported(
-                    preSetPartner,
-                    paymentMethod,
-                    coin,
-                    chain,
-                    offersDefault[preSetPartner].fiatCurrency,
-                    country,
-                  ) &&
-                  (!buyCryptoConfig?.[preSetPartner] ||
-                    !buyCryptoConfig?.[preSetPartner]?.removed)
-                : false;
-          } else {
-            offersDefault[exchange].showOffer =
-              isPaymentMethodSupported(
-                exchange,
-                paymentMethod,
-                coin,
-                chain,
-                offersDefault[exchange].fiatCurrency,
-                country,
-              ) &&
-              (!buyCryptoConfig?.[exchange] ||
-                !buyCryptoConfig?.[exchange]?.removed);
-          }
-        }
-      }
-    });
-
     const showedOffersCount = Object.values(cloneDeep(offers)).filter(
       offer => offer.showOffer,
     ).length;
diff --git a/src/navigation/services/screens/BuyAndSellRoot.tsx b/src/navigation/services/screens/BuyAndSellRoot.tsx
@@ -500,6 +500,8 @@ const BuyAndSellRoot = ({
   useEffect(() => {
     if (selectedOffer && buttonState !== 'loading' && !openingBrowser) {
       setContinueEnabled(true);
+    } else {
+      setContinueEnabled(false);
     }
   }, [selectedOffer, buttonState, openingBrowser]);
 
@@ -546,7 +548,12 @@ const BuyAndSellRoot = ({
     if (!currency) {
       return;
     }
-    updateAmount('0');
+    if (fromAmount && !isNaN(fromAmount)) {
+      // Valid fromAmount
+      updateAmount(fromAmount.toString());
+    } else {
+      updateAmount('0');
+    }
     // if added for dev (hot reload)
     if (
       !primaryIsFiat &&
@@ -617,8 +624,6 @@ const BuyAndSellRoot = ({
 
   const initBuyCrypto = async () => {
     try {
-      await sleep(100);
-      dispatch(startOnGoingProcessModal('GENERAL_AWAITING'));
       const requestData: ExternalServicesConfigRequestParams = {
         currentLocationCountry: locationData?.countryShortCode,
         currentLocationState: locationData?.stateShortCode,
@@ -808,12 +813,14 @@ const BuyAndSellRoot = ({
   };
 
   useMount(() => {
+    dispatch(startOnGoingProcessModal('GENERAL_AWAITING'));
     if (context === 'buyCrypto') {
       try {
         initBuyCrypto();
       } catch (err: any) {
         const errStr = err instanceof Error ? err.message : JSON.stringify(err);
         logger.error(`[Buy] could not initialize view: ${errStr}`);
+        dispatch(dismissOnGoingProcessModal());
       }
     } else if (context === 'sellCrypto') {
       // TODO initSellCrypto();
@@ -865,6 +872,13 @@ const BuyAndSellRoot = ({
   const goTo = (offer: CryptoOffer, paymentMethod: PaymentMethod): void => {
     setButtonState('loading');
     setOpeningBrowser(true);
+    dispatch(
+      BuyCryptoActions.updateBuyCryptoOpts({
+        buyCryptoOpts: {
+          selectedPaymentMethod: paymentMethod.method,
+        },
+      }),
+    );
     switch (offer.key) {
       case 'banxa':
         goToBanxaBuyPage(offer, paymentMethod);
diff --git a/src/navigation/tabs/home/components/advertisements/AdvertisementsList.tsx b/src/navigation/tabs/home/components/advertisements/AdvertisementsList.tsx
@@ -6,7 +6,7 @@ import AdvertisementCard from './AdvertisementCard';
 import {BoxShadow} from '../Styled';
 import {useNavigation} from '@react-navigation/native';
 import {useRequireKeyAndWalletRedirect} from '../../../../../utils/hooks/useRequireKeyAndWalletRedirect';
-import {WalletScreens} from '../../../../wallet/WalletGroup';
+import {ExternalServicesScreens} from '../../../../services/ExternalServicesGroup';
 
 interface AdvertisementListProps {
   contentCards: ContentCard[];
@@ -27,12 +27,7 @@ const AdvertisementsList: React.FC<AdvertisementListProps> = props => {
   const navigation = useNavigation();
 
   const buyCryptoCta = useRequireKeyAndWalletRedirect(() => {
-    navigation.navigate(WalletScreens.AMOUNT, {
-      onAmountSelected: (amount: string) => {
-        navigation.navigate('BuyCryptoRoot', {
-          amount: Number(amount),
-        });
-      },
+    navigation.navigate(ExternalServicesScreens.ROOT_BUY_AND_SELL, {
       context: 'buyCrypto',
     });
   });
diff --git a/src/navigation/tabs/home/components/advertisements/DefaultAdvertisements.tsx b/src/navigation/tabs/home/components/advertisements/DefaultAdvertisements.tsx
@@ -56,7 +56,7 @@ const DefaultAdvertisements = (
       cardDescription: t(
         'Buy direct using your debit, credit card, or Apple Pay.',
       ),
-      url: `${APP_DEEPLINK_PREFIX}buy/50`,
+      url: `${APP_DEEPLINK_PREFIX}buy/100`,
       openURLInWebView: false,
     },
   ];
diff --git a/src/navigation/wallet/screens/AccountDetails.tsx b/src/navigation/wallet/screens/AccountDetails.tsx
@@ -167,6 +167,7 @@ import {
 import {startOnGoingProcessModal} from '../../../store/app/app.effects';
 import {BWCErrorMessage} from '../../../constants/BWCError';
 import {BitpaySupportedTokenOptsByAddress} from '../../../constants/tokens';
+import {ExternalServicesScreens} from '../../services/ExternalServicesGroup';
 
 export type AccountDetailsScreenParamList = {
   selectedAccountAddress: string;
@@ -1296,15 +1297,7 @@ const AccountDetails: React.FC<AccountDetailsScreenProps> = ({route}) => {
                     context: 'AccountDetails',
                   }),
                 );
-                navigation.navigate(WalletScreens.AMOUNT, {
-                  onAmountSelected: async (
-                    amount: string,
-                    setButtonState: any,
-                  ) => {
-                    navigation.navigate('BuyCryptoRoot', {
-                      amount: Number(amount),
-                    });
-                  },
+                navigation.navigate(ExternalServicesScreens.ROOT_BUY_AND_SELL, {
                   context: 'buyCrypto',
                 });
               },
diff --git a/src/navigation/wallet/screens/Backup.tsx b/src/navigation/wallet/screens/Backup.tsx
@@ -16,13 +16,14 @@ import {OnboardingImage} from '../../onboarding/components/Containers';
 import haptic from '../../../components/haptic-feedback/haptic';
 import {showBottomNotificationModal} from '../../../store/app/app.actions';
 import {WalletGroupParamList, WalletScreens} from '../WalletGroup';
-import {Key, Wallet} from '../../../store/wallet/wallet.models';
+import {Key} from '../../../store/wallet/wallet.models';
 import {NavigationProp, useNavigation} from '@react-navigation/native';
 import {StackActions} from '@react-navigation/native';
 import {RootState} from '../../../store';
 import {NativeStackScreenProps} from '@react-navigation/native-stack';
 import {useThemeType} from '../../../utils/hooks/useThemeType';
 import {useTranslation} from 'react-i18next';
+import {ExternalServicesScreens} from '../../services/ExternalServicesGroup';
 
 const BackupImage = {
   light: (
@@ -89,7 +90,9 @@ export const backupRedirect = ({
   } else if (context === 'swapCrypto' || context === 'swapTo') {
     navigation.navigate('SwapCryptoRoot');
   } else if (context === 'buyCrypto') {
-    navigation.navigate('BuyCryptoRoot');
+    navigation.navigate(ExternalServicesScreens.ROOT_BUY_AND_SELL, {
+      context: 'buyCrypto',
+    });
   } else {
     navigation.dispatch(StackActions.popToTop());
     navigation.dispatch(StackActions.push('KeyOverview', {id: key.id}));
diff --git a/src/navigation/wallet/screens/GlobalSelect.tsx b/src/navigation/wallet/screens/GlobalSelect.tsx
@@ -876,9 +876,10 @@ const GlobalSelect: React.FC<GlobalSelectScreenProps | GlobalSelectProps> = ({
             params: {screen: 'Home'},
           },
           {
-            name: 'BuyCryptoRoot',
+            name: 'BuyAndSellRoot',
             params: {
               amount: 200,
+              context: 'buyCrypto',
             },
           },
         ],
diff --git a/src/navigation/wallet/screens/KeyOverview.tsx b/src/navigation/wallet/screens/KeyOverview.tsx
@@ -212,7 +212,9 @@ const KeyOverview = () => {
   const showArchaxBanner = useAppSelector(({APP}) => APP.showArchaxBanner);
   const [showKeyOptions, setShowKeyOptions] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
-  const {keys}: {keys: {[key: string]: Key}} = useAppSelector(({WALLET}) => WALLET);
+  const {keys}: {keys: {[key: string]: Key}} = useAppSelector(
+    ({WALLET}) => WALLET,
+  );
   const {rates} = useAppSelector(({RATE}) => RATE);
   const {defaultAltCurrency, hideAllBalances} = useAppSelector(({APP}) => APP);
   const linkedCoinbase = useAppSelector(
diff --git a/src/navigation/wallet/screens/WalletDetails.tsx b/src/navigation/wallet/screens/WalletDetails.tsx
@@ -138,6 +138,7 @@ import {getGiftCardIcons} from '../../../lib/gift-cards/gift-card';
 import {BillPayAccount} from '../../../store/shop/shop.models';
 import debounce from 'lodash.debounce';
 import ArchaxFooter from '../../../components/archax/archax-footer';
+import {ExternalServicesScreens} from '../../services/ExternalServicesGroup';
 
 export type WalletDetailsScreenParamList = {
   walletId: string;
@@ -1164,15 +1165,13 @@ const WalletDetails: React.FC<WalletDetailsScreenProps> = ({route}) => {
                             chain: fullWalletObj.chain || '',
                           }),
                         );
-                        navigation.navigate(WalletScreens.AMOUNT, {
-                          onAmountSelected: async (amount: string) => {
-                            navigation.navigate('BuyCryptoRoot', {
-                              amount: Number(amount),
-                              fromWallet: fullWalletObj,
-                            });
+                        navigation.navigate(
+                          ExternalServicesScreens.ROOT_BUY_AND_SELL,
+                          {
+                            context: 'buyCrypto',
+                            fromWallet: fullWalletObj,
                           },
-                          context: 'buyCrypto',
-                        });
+                        );
                       },
                     }}
                     sell={{
diff --git a/src/store/buy-crypto/buy-crypto.effects.ts b/src/store/buy-crypto/buy-crypto.effects.ts
@@ -3,14 +3,14 @@ import {getMoonpayFiatAmountLimits} from '../../navigation/services/buy-crypto/u
 import {getRampFiatAmountLimits} from '../../navigation/services/buy-crypto/utils/ramp-utils';
 import {getSardineFiatAmountLimits} from '../../navigation/services/buy-crypto/utils/sardine-utils';
 import {getSimplexFiatAmountLimits} from '../../navigation/services/buy-crypto/utils/simplex-utils';
-import {WalletScreens} from '../../navigation/wallet/WalletGroup';
 import {getTransakFiatAmountLimits} from '../../navigation/services/buy-crypto/utils/transak-utils';
 import {navigationRef} from '../../Root';
 import {Effect} from '../index';
 import {LogActions} from '../log';
 import {BuyCryptoLimits} from './buy-crypto.models';
 import {Analytics} from '../analytics/analytics.effects';
 import {BuyCryptoExchangeKey} from '../../navigation/services/buy-crypto/utils/buy-crypto-utils';
+import {ExternalServicesScreens} from '../../navigation/services/ExternalServicesGroup';
 
 export const calculateAltFiatToUsd =
   (
@@ -211,12 +211,7 @@ export const goToBuyCrypto = (): Effect<void> => dispatch => {
       context: 'Shortcuts',
     }),
   );
-  navigationRef.navigate(WalletScreens.AMOUNT, {
-    onAmountSelected: async (amount: string, setButtonState: any) => {
-      navigationRef.navigate('BuyCryptoRoot', {
-        amount: Number(amount),
-      });
-    },
+  navigationRef.navigate(ExternalServicesScreens.ROOT_BUY_AND_SELL, {
     context: 'buyCrypto',
   });
 };
diff --git a/src/store/scan/scan.effects.ts b/src/store/scan/scan.effects.ts
@@ -119,8 +119,9 @@ import {SwapCryptoScreens} from '../../navigation/services/swap-crypto/SwapCrypt
 import {SimplexSellIncomingData} from '../sell-crypto/models/simplex-sell.models';
 import {ExternalServicesSettingsScreens} from '../../navigation/tabs/settings/external-services/ExternalServicesGroup';
 import {BitpaySupportedTokenOptsByAddress} from '../../constants/tokens';
-import {getTokenContractInfo} from '../wallet/effects/status/status';
 import {SolanaPayOpts} from '../../navigation/wallet/screens/send/confirm/Confirm';
+import {ExternalServicesScreens} from '../../navigation/services/ExternalServicesGroup';
+import {BuyAndSellRootProps} from '../../navigation/services/screens/BuyAndSellRoot';
 
 export const incomingData =
   (
@@ -1508,13 +1509,14 @@ const handleBuyCryptoUri =
           params: {screen: 'Home'},
         },
         {
-          name: 'BuyCryptoRoot',
+          name: ExternalServicesScreens.ROOT_BUY_AND_SELL,
           params: {
             partner,
             amount: _amount,
             currencyAbbreviation: coin,
             chain,
-          },
+            context: 'buyCrypto',
+          } as BuyAndSellRootProps,
         },
       ],
     });
diff --git a/src/store/wallet/effects/send/send.ts b/src/store/wallet/effects/send/send.ts
diff --git a/src/utils/hooks/useDeeplinks.ts b/src/utils/hooks/useDeeplinks.ts
