From 7edfd995a87dbeaee2f21b9b75e5246493be38f5 Mon Sep 17 00:00:00 2001
From: Mounir Hamzaoui <mounir.hamzaoui@ledger.fr>
Date: Wed, 11 Dec 2024 18:15:03 +0100
Subject: [PATCH] feat: migrate all entry screen, ctas to new add account
 (uncompleted v2) flow

---
 .../FabActions/hooks/useAssetActions.tsx      |   8 +-
 .../RootNavigator/types/SwapNavigator.ts      |   7 +-
 .../features/AssetSelection/Navigator.tsx     |  44 ++++-
 .../screens/SelectCrypto/index.tsx            |  11 +-
 .../screens/TokenCurrencyDisclamer/index.tsx  | 172 ++++++++++++++++++
 .../newArch/features/AssetSelection/types.ts  |  34 ++--
 .../features/DeviceSelection/Navigator.tsx    |   1 +
 .../Modals/InstalledAppModal.tsx              |  14 +-
 .../screens/ReceiveFunds/02-SelectAccount.tsx |  35 ++--
 .../RequestAccount/02-SelectAccount.tsx       |  22 ++-
 .../src/screens/Swap/Form/Summary/index.tsx   |  53 ++++--
 .../screens/Swap/SubScreens/SelectAccount.tsx |  42 +++--
 .../src/screens/WalletCentricAsset/index.tsx  |  33 ++--
 .../src/deposit/deposit.integration.test.ts   |  32 +++-
 libs/ledger-live-common/src/deposit/type.ts   |   5 +
 .../useGroupedCurrenciesByProvider.hook.ts    |  26 ++-
 16 files changed, 439 insertions(+), 100 deletions(-)
 create mode 100644 apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/TokenCurrencyDisclamer/index.tsx

diff --git a/apps/ledger-live-mobile/src/components/FabActions/hooks/useAssetActions.tsx b/apps/ledger-live-mobile/src/components/FabActions/hooks/useAssetActions.tsx
index 278b741daeb4..665c66e18cc1 100644
--- a/apps/ledger-live-mobile/src/components/FabActions/hooks/useAssetActions.tsx
+++ b/apps/ledger-live-mobile/src/components/FabActions/hooks/useAssetActions.tsx
@@ -38,6 +38,7 @@ export default function useAssetActions({ currency, accounts }: useAssetActionsP
   const { data: currenciesAll } = useFetchCurrencyAll();
 
   const ptxServiceCtaScreens = useFeature("ptxServiceCtaScreens");
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
 
   const { t } = useTranslation();
   const stakeLabel = getStakeLabelLocaleBased();
@@ -226,11 +227,16 @@ export default function useAssetActions({ currency, accounts }: useAssetActionsP
                     label: t("addAccountsModal.ctaAdd"),
                     Icon: iconAddAccount,
                     navigationParams: [
-                      NavigatorName.AddAccounts,
+                      llmNetworkBasedAddAccountFlow?.enabled
+                        ? NavigatorName.AssetSelection
+                        : NavigatorName.AddAccounts,
                       {
                         screen: ScreenName.AddAccountsSelectCrypto,
                         params: {
                           filterCurrencyIds: currency ? [currency.id] : undefined,
+                          ...(llmNetworkBasedAddAccountFlow?.enabled && {
+                            context: "addAccounts",
+                          }),
                         },
                       },
                     ] as const,
diff --git a/apps/ledger-live-mobile/src/components/RootNavigator/types/SwapNavigator.ts b/apps/ledger-live-mobile/src/components/RootNavigator/types/SwapNavigator.ts
index fabdb2249ade..bb8e2fc187f1 100644
--- a/apps/ledger-live-mobile/src/components/RootNavigator/types/SwapNavigator.ts
+++ b/apps/ledger-live-mobile/src/components/RootNavigator/types/SwapNavigator.ts
@@ -44,7 +44,9 @@ import type { Transaction as CasperTransaction } from "@ledgerhq/live-common/fam
 import type { Transaction as TonTransaction } from "@ledgerhq/live-common/families/ton/types";
 import BigNumber from "bignumber.js";
 import { Account, Operation } from "@ledgerhq/types-live";
-import { ScreenName } from "~/const";
+import { NavigatorName, ScreenName } from "~/const";
+import { NavigatorScreenParams } from "@react-navigation/core";
+import { AssetSelectionNavigatorParamsList } from "~/newArch/features/AssetSelection/types";
 
 type Target = "from" | "to";
 
@@ -329,4 +331,7 @@ export type SwapNavigatorParamList = {
       | ScreenName.SendSelectDevice
       | ScreenName.SwapForm;
   };
+  [NavigatorName.AssetSelection]?: Partial<
+    NavigatorScreenParams<AssetSelectionNavigatorParamsList>
+  >;
 };
diff --git a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/Navigator.tsx b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/Navigator.tsx
index 1a6cd42457fc..8f672d7b5b82 100644
--- a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/Navigator.tsx
+++ b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/Navigator.tsx
@@ -1,9 +1,9 @@
-import React, { useCallback, useMemo } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import { Platform } from "react-native";
 import { createStackNavigator } from "@react-navigation/stack";
 import { useTheme } from "styled-components/native";
-import { useRoute } from "@react-navigation/native";
-import { ScreenName } from "~/const";
+import { useNavigation, useRoute } from "@react-navigation/native";
+import { NavigatorName, ScreenName } from "~/const";
 import { getStackNavigatorConfig } from "~/navigation/navigatorConfig";
 import { track } from "~/analytics";
 import { Flex } from "@ledgerhq/native-ui";
@@ -16,13 +16,23 @@ import SelectNetwork from "LLM/features/AssetSelection/screens/SelectNetwork";
 import { NavigationHeaderCloseButtonAdvanced } from "~/components/NavigationHeaderCloseButton";
 import { NavigationHeaderBackButton } from "~/components/NavigationHeaderBackButton";
 import { AssetSelectionNavigatorParamsList } from "./types";
+import { BaseComposite, StackNavigatorProps } from "~/components/RootNavigator/types/helpers";
+import TokenCurrencyDisclaimer from "./screens/TokenCurrencyDisclamer";
+import { useTranslation } from "react-i18next";
+
+type NavigationProps = BaseComposite<
+  StackNavigatorProps<AssetSelectionNavigatorParamsList, NavigatorName.AssetSelection>
+>;
 
 export default function Navigator() {
   const { colors } = useTheme();
-  const route = useRoute();
+  const route = useRoute<NavigationProps["route"]>();
 
+  const { t } = useTranslation();
   const hasClosedNetworkBanner = useSelector(hasClosedNetworkBannerSelector);
 
+  const { token } = route.params || {};
+
   const onClose = useCallback(() => {
     track("button_clicked", {
       button: "Close",
@@ -44,6 +54,9 @@ export default function Navigator() {
         ...stackNavigationConfig,
         gestureEnabled: Platform.OS === "ios",
       }}
+      initialRouteName={
+        token ? ScreenName.AddAccountsTokenCurrencyDisclaimer : ScreenName.AddAccountsSelectCrypto
+      }
     >
       <Stack.Screen
         name={ScreenName.AddAccountsSelectCrypto}
@@ -53,6 +66,9 @@ export default function Navigator() {
           headerTitle: "",
           headerRight: () => <NavigationHeaderCloseButtonAdvanced onClose={onClose} />,
         }}
+        initialParams={{
+          ...(route?.params || {}),
+        }}
       />
 
       <Stack.Screen
@@ -70,6 +86,26 @@ export default function Navigator() {
             </Flex>
           ),
         }}
+        initialParams={{
+          ...(route?.params || {}),
+        }}
+      />
+      <Stack.Screen
+        name={ScreenName.AddAccountsTokenCurrencyDisclaimer}
+        component={TokenCurrencyDisclaimer}
+        initialParams={
+          token
+            ? {
+                token,
+              }
+            : undefined
+        }
+        options={{
+          title: t("addAccounts.tokens.title"),
+        }}
+        initialParams={{
+          ...(route?.params || {}),
+        }}
       />
     </Stack.Navigator>
   );
diff --git a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/SelectCrypto/index.tsx b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/SelectCrypto/index.tsx
index 9e5bd36b0b15..2edd67f50994 100644
--- a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/SelectCrypto/index.tsx
+++ b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/SelectCrypto/index.tsx
@@ -50,7 +50,8 @@ export default function SelectCrypto({
   const { t } = useTranslation();
   const accounts = useSelector(flattenAccountsSelector);
 
-  const { currenciesByProvider, sortedCryptoCurrencies } = useGroupedCurrenciesByProvider();
+  const { result, loadingStatus } = useGroupedCurrenciesByProvider(true);
+  const { currenciesByProvider, sortedCryptoCurrencies } = result;
 
   const onPressItem = useCallback(
     (curr: CryptoCurrency | TokenCurrency) => {
@@ -64,7 +65,6 @@ export default function SelectCrypto({
           currencyByNetwork => (currencyByNetwork as CryptoCurrency | TokenCurrency).id === curr.id,
         ),
       );
-
       // If the selected currency exists on multiple networks we redirect to the SelectNetwork screen
       if (provider && provider?.currenciesByNetwork.length > 1) {
         navigation.navigate(ScreenName.SelectNetwork, {
@@ -103,12 +103,11 @@ export default function SelectCrypto({
   useEffect(() => {
     if (paramsCurrency) {
       const selectedCurrency = findCryptoCurrencyByKeyword(paramsCurrency.toUpperCase());
-
-      if (selectedCurrency) {
+      if (selectedCurrency && loadingStatus === "success") {
         onPressItem(selectedCurrency);
       }
     }
-  }, [onPressItem, paramsCurrency]);
+  }, [onPressItem, paramsCurrency, loadingStatus]);
 
   const debounceTrackOnSearchChange = debounce((newQuery: string) => {
     track("asset_searched", { page: "Choose a crypto to secure", asset: newQuery });
@@ -143,7 +142,7 @@ export default function SelectCrypto({
       <Text variant="h4" fontWeight="semiBold" mx={6} testID="receive-header-step1-title">
         {t("transfer.receive.selectCrypto.title")}
       </Text>
-      {list.length > 0 ? (
+      {list.length > 0 && loadingStatus === "success" ? (
         <Flex flex={1} ml={6} mr={6} mt={3}>
           <FilteredSearchBar
             keys={SEARCH_KEYS}
diff --git a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/TokenCurrencyDisclamer/index.tsx b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/TokenCurrencyDisclamer/index.tsx
new file mode 100644
index 000000000000..5819d8fc8586
--- /dev/null
+++ b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/screens/TokenCurrencyDisclamer/index.tsx
@@ -0,0 +1,172 @@
+import React, { useCallback } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import { StyleSheet, View, SafeAreaView } from "react-native";
+import { useSelector } from "react-redux";
+import { findTokenAccountByCurrency } from "@ledgerhq/live-common/account/index";
+import { CompositeScreenProps, useTheme } from "@react-navigation/native";
+import { accountsSelector } from "~/reducers/accounts";
+import CurrencyIcon from "~/components/CurrencyIcon";
+import Button from "~/components/Button";
+import Alert from "~/components/Alert";
+import LText from "~/components/LText";
+import { urls } from "~/utils/urls";
+import { ScreenName, NavigatorName } from "~/const";
+import { TrackScreen } from "~/analytics";
+import {
+  StackNavigatorNavigation,
+  StackNavigatorProps,
+} from "~/components/RootNavigator/types/helpers";
+import { BaseNavigatorStackParamList } from "~/components/RootNavigator/types/BaseNavigator";
+import { AssetSelectionNavigatorParamsList } from "../../types";
+
+type Props = CompositeScreenProps<
+  StackNavigatorProps<
+    AssetSelectionNavigatorParamsList,
+    ScreenName.AddAccountsTokenCurrencyDisclaimer
+  >,
+  StackNavigatorProps<BaseNavigatorStackParamList>
+>;
+
+export default function TokenCurrencyDisclaimer({ navigation, route }: Props) {
+  const { colors } = useTheme();
+  const { t } = useTranslation();
+  const accounts = useSelector(accountsSelector);
+  const token = route.params.token;
+  const tokenName = `${token.name} (${token.ticker})`;
+  const parentCurrency = token.parentCurrency;
+  const accountData = findTokenAccountByCurrency(token, accounts);
+  const parentTokenAccount = accountData ? accountData.parentAccount : null;
+  const onClose = useCallback(() => {
+    navigation.getParent<StackNavigatorNavigation<BaseNavigatorStackParamList>>().pop();
+  }, [navigation]);
+  // specific cta in case of token accounts
+  const onTokenCta = useCallback(() => {
+    if (parentTokenAccount && parentTokenAccount.type === "Account") {
+      onClose();
+      navigation.navigate(NavigatorName.ReceiveFunds, {
+        screen: ScreenName.ReceiveConfirmation,
+        params: {
+          // prefilter with token curency
+          accountId: parentTokenAccount.id,
+          currency: token,
+          createTokenAccount: true,
+        },
+      });
+    } else {
+      // set parentCurrency in already opened add account flow and continue
+      navigation.navigate(NavigatorName.DeviceSelection, {
+        screen: ScreenName.SelectDevice,
+        params: {
+          ...route.params,
+          currency: parentCurrency,
+        },
+      });
+    }
+  }, [parentTokenAccount, onClose, navigation, token, route.params, parentCurrency]);
+  return (
+    <SafeAreaView
+      style={[
+        styles.root,
+        {
+          backgroundColor: colors.background,
+        },
+      ]}
+    >
+      <View style={styles.container}>
+        <TrackScreen
+          category="AddAccounts"
+          name="TokenCurrencyDisclaimer"
+          currencyName={tokenName}
+        />
+        <View style={styles.wrapper}>
+          <CurrencyIcon size={56} radius={16} currency={token} />
+        </View>
+        <View style={[styles.wrapper, styles.spacer]}>
+          <LText secondary bold style={styles.tokenName}>
+            {tokenName}
+          </LText>
+        </View>
+        <View style={styles.disclaimerWrapper}>
+          <Alert
+            type="primary"
+            learnMoreUrl={
+              urls.supportLinkByTokenType[
+                token.tokenType as keyof typeof urls.supportLinkByTokenType
+              ]
+            }
+            learnMoreKey={`addAccounts.tokens.generic.learnMore`}
+            learnMoreTransValues={{
+              tokenType: token.tokenType.toUpperCase(),
+            }}
+          >
+            <Trans
+              i18nKey={`addAccounts.tokens.generic.disclaimer`}
+              values={{
+                token: token.name,
+                ticker: token.ticker,
+                tokenType: token.tokenType.toUpperCase(),
+                currency: token.parentCurrency.name,
+              }}
+            />
+          </Alert>
+        </View>
+        <View style={styles.buttonWrapper}>
+          <Button
+            event="AddAccountTokenDisclaimerClose"
+            title={t("common.close")}
+            type="secondary"
+            onPress={onClose}
+            containerStyle={[styles.buttonSpace]}
+          />
+          <Button
+            event="AddAccountTokenDisclaimerBack"
+            title={
+              parentTokenAccount
+                ? t("account.receive")
+                : t("addAccounts.tokens.createParentCurrencyAccount", {
+                    parrentCurrencyName: token.parentCurrency.ticker,
+                  })
+            }
+            type="primary"
+            onPress={onTokenCta}
+            containerStyle={styles.button}
+          />
+        </View>
+      </View>
+    </SafeAreaView>
+  );
+}
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+  },
+  container: {
+    flex: 1,
+    padding: 16,
+    paddingTop: 32,
+  },
+  wrapper: {
+    justifyContent: "center",
+    alignItems: "center",
+  },
+  spacer: {
+    paddingTop: 16,
+  },
+  tokenName: {
+    fontSize: 18,
+  },
+  buttonWrapper: {
+    flexDirection: "row",
+  },
+  button: {
+    flex: 1,
+  },
+  buttonSpace: {
+    marginRight: 16,
+    flex: 0.5,
+  },
+  disclaimerWrapper: {
+    flex: 1,
+    paddingTop: 32,
+  },
+});
diff --git a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/types.ts b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/types.ts
index 833b61018759..2ac40bbd43d5 100644
--- a/apps/ledger-live-mobile/src/newArch/features/AssetSelection/types.ts
+++ b/apps/ledger-live-mobile/src/newArch/features/AssetSelection/types.ts
@@ -1,10 +1,18 @@
-import { CryptoCurrency, CryptoOrTokenCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { CryptoOrTokenCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { NavigatorScreenParams } from "@react-navigation/core";
 import { NavigatorName, ScreenName } from "~/const";
-
+import { DeviceSelectionNavigatorParamsList } from "../DeviceSelection/types";
+import { NetworkBasedAddAccountNavigator } from "../Accounts/screens/AddAccount/types";
+type CommpnParams = {
+  context?: "addAccounts" | "receiveFunds";
+  onSuccess?: () => void;
+};
 export type AssetSelectionNavigatorParamsList = {
-  [ScreenName.AddAccountsSelectCrypto]: {
+  [ScreenName.AddAccountsSelectCrypto]: CommpnParams & {
     filterCurrencyIds?: string[];
     currency?: string;
+    returnToSwap?: boolean;
+    analyticsPropertyFlow?: string;
   };
   [ScreenName.SelectNetwork]:
     | {
@@ -15,18 +23,12 @@ export type AssetSelectionNavigatorParamsList = {
         };
       }
     | undefined;
-  [NavigatorName.AddAccounts]: {
-    screen: ScreenName;
-    params: {
-      currency: CryptoCurrency | TokenCurrency;
-      createTokenAccount?: boolean;
-    };
-  };
-  [NavigatorName.DeviceSelection]: {
-    screen: ScreenName;
-    params: {
-      currency: CryptoCurrency;
-      createTokenAccount?: boolean;
-    };
+  [ScreenName.AddAccountsTokenCurrencyDisclaimer]: {
+    token: TokenCurrency;
+    analyticsPropertyFlow?: string;
   };
+  [NavigatorName.DeviceSelection]?: Partial<
+    NavigatorScreenParams<DeviceSelectionNavigatorParamsList>
+  >;
+  [NavigatorName.AddAccounts]?: Partial<NavigatorScreenParams<NetworkBasedAddAccountNavigator>>;
 };
diff --git a/apps/ledger-live-mobile/src/newArch/features/DeviceSelection/Navigator.tsx b/apps/ledger-live-mobile/src/newArch/features/DeviceSelection/Navigator.tsx
index 72b78053ed57..01a35c79193d 100644
--- a/apps/ledger-live-mobile/src/newArch/features/DeviceSelection/Navigator.tsx
+++ b/apps/ledger-live-mobile/src/newArch/features/DeviceSelection/Navigator.tsx
@@ -68,6 +68,7 @@ export default function Navigator() {
           ),
           ...addAccountsSelectDeviceHeaderOptions(onClose),
         }}
+        initialParams={route.params}
       />
 
       {/* Select / Connect Device */}
diff --git a/apps/ledger-live-mobile/src/screens/MyLedgerDevice/Modals/InstalledAppModal.tsx b/apps/ledger-live-mobile/src/screens/MyLedgerDevice/Modals/InstalledAppModal.tsx
index 5dc71343f745..119f32a6461b 100644
--- a/apps/ledger-live-mobile/src/screens/MyLedgerDevice/Modals/InstalledAppModal.tsx
+++ b/apps/ledger-live-mobile/src/screens/MyLedgerDevice/Modals/InstalledAppModal.tsx
@@ -17,6 +17,7 @@ import AppIcon from "../AppsList/AppIcon";
 import QueuedDrawer from "~/components/QueuedDrawer";
 import type { BaseComposite, StackNavigatorProps } from "~/components/RootNavigator/types/helpers";
 import { MyLedgerNavigatorStackParamList } from "~/components/RootNavigator/types/MyLedgerNavigator";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 type NavigationProps = BaseComposite<
   StackNavigatorProps<MyLedgerNavigatorStackParamList, ScreenName.MyLedgerDevice>
@@ -49,11 +50,18 @@ const ButtonsContainer = styled(Flex).attrs({
 const InstallSuccessBar = ({ state, navigation, disable }: Props) => {
   const [hasBeenShown, setHasBeenShown] = useState(disable);
   const { installQueue, uninstallQueue, recentlyInstalledApps, appByName, installed } = state;
-
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
   const onAddAccount = useCallback(() => {
-    navigation.navigate(NavigatorName.AddAccounts);
+    if (llmNetworkBasedAddAccountFlow?.enabled)
+      navigation.navigate(NavigatorName.AssetSelection, {
+        params: {
+          context: "addAccounts",
+        },
+      });
+    else navigation.navigate(NavigatorName.AddAccounts);
+
     setHasBeenShown(true);
-  }, [navigation]);
+  }, [navigation, llmNetworkBasedAddAccountFlow?.enabled]);
 
   const successInstalls = useMemo(
     () =>
diff --git a/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx b/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx
index 4b7224be2c17..f23e63d0ae83 100644
--- a/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx
+++ b/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx
@@ -19,6 +19,7 @@ import { useNavigation } from "@react-navigation/core";
 import { withDiscreetMode } from "~/context/DiscreetModeContext";
 import { walletSelector } from "~/reducers/wallet";
 import { accountNameWithDefaultSelector } from "@ledgerhq/live-wallet/store";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 type SubAccountEnhanced = SubAccount & {
   parentAccount: Account;
@@ -39,9 +40,11 @@ function ReceiveSelectAccount({
   ScreenName.ReceiveSelectAccount
 >) {
   const currency = route?.params?.currency;
+
   const { t } = useTranslation();
   const navigationAccount = useNavigation<NavigationProps["navigation"]>();
   const insets = useSafeAreaInsets();
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
   const accounts = useSelector(
     currency && currency.type === "CryptoCurrency"
       ? flattenAccountsByCryptoCurrencyScreenSelector(currency)
@@ -123,20 +126,30 @@ function ReceiveSelectAccount({
       button: "Create a new account",
       page: "Select account to deposit to",
     });
-    if (currency && currency.type === "TokenCurrency") {
-      navigationAccount.navigate(NavigatorName.AddAccounts, {
-        screen: undefined,
-        params: {
-          token: currency,
-        },
+
+    if (llmNetworkBasedAddAccountFlow?.enabled) {
+      navigationAccount.navigate(NavigatorName.AssetSelection, {
+        ...(currency && currency.type === "TokenCurrency"
+          ? { token: currency.id }
+          : { currency: currency.id }),
+        context: "addAccounts",
       });
     } else {
-      navigationAccount.navigate(NavigatorName.AddAccounts, {
-        screen: undefined,
-        currency,
-      });
+      if (currency && currency.type === "TokenCurrency") {
+        navigationAccount.navigate(NavigatorName.AddAccounts, {
+          screen: undefined,
+          params: {
+            token: currency,
+          },
+        });
+      } else {
+        navigationAccount.navigate(NavigatorName.AddAccounts, {
+          screen: undefined,
+          currency,
+        });
+      }
     }
-  }, [currency, navigationAccount]);
+  }, [currency, navigationAccount, llmNetworkBasedAddAccountFlow?.enabled]);
 
   const keyExtractor = useCallback((item: AccountLikeEnhanced) => item?.id, []);
 
diff --git a/apps/ledger-live-mobile/src/screens/RequestAccount/02-SelectAccount.tsx b/apps/ledger-live-mobile/src/screens/RequestAccount/02-SelectAccount.tsx
index a487fca28e61..d82bda52b3a3 100644
--- a/apps/ledger-live-mobile/src/screens/RequestAccount/02-SelectAccount.tsx
+++ b/apps/ledger-live-mobile/src/screens/RequestAccount/02-SelectAccount.tsx
@@ -23,6 +23,7 @@ import type {
 import { RequestAccountNavigatorParamList } from "~/components/RootNavigator/types/RequestAccountNavigator";
 import { BaseNavigatorStackParamList } from "~/components/RootNavigator/types/BaseNavigator";
 import { Flex } from "@ledgerhq/native-ui";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 const SEARCH_KEYS = [
   "name",
@@ -99,6 +100,7 @@ function SelectAccount({ navigation, route }: Props) {
   const { accounts$, currency, allowAddAccount, onSuccess } = route.params;
   const accountIds = useGetAccountIds(accounts$);
   const accounts = useSelector(accountsByCryptoCurrencyScreenSelector(currency, accountIds));
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
   const onSelect = useCallback(
     (account: AccountLike, parentAccount?: Account) => {
       onSuccess && onSuccess(account, parentAccount);
@@ -115,13 +117,21 @@ function SelectAccount({ navigation, route }: Props) {
   );
 
   const onAddAccount = useCallback(() => {
-    navigation.navigate(NavigatorName.RequestAccountsAddAccounts, {
-      screen: ScreenName.AddAccountsSelectDevice,
-      params: {
-        currency: currency as CryptoOrTokenCurrency,
-        onSuccess: () => navigation.navigate(ScreenName.RequestAccountsSelectAccount, route.params),
+    navigation.navigate(
+      llmNetworkBasedAddAccountFlow?.enabled
+        ? NavigatorName.DeviceSelection
+        : NavigatorName.RequestAccountsAddAccounts,
+      {
+        screen: llmNetworkBasedAddAccountFlow?.enabled
+          ? ScreenName.SelectDevice
+          : ScreenName.AddAccountsSelectDevice,
+        params: {
+          currency: currency as CryptoOrTokenCurrency,
+          onSuccess: () =>
+            navigation.navigate(ScreenName.RequestAccountsSelectAccount, route.params),
+        },
       },
-    });
+    );
   }, [currency, navigation, route.params]);
 
   const renderFooter = useCallback(
diff --git a/apps/ledger-live-mobile/src/screens/Swap/Form/Summary/index.tsx b/apps/ledger-live-mobile/src/screens/Swap/Form/Summary/index.tsx
index 3f9b8f18f6d4..a0a2a72f933b 100644
--- a/apps/ledger-live-mobile/src/screens/Swap/Form/Summary/index.tsx
+++ b/apps/ledger-live-mobile/src/screens/Swap/Form/Summary/index.tsx
@@ -29,6 +29,7 @@ import { sharedSwapTracking } from "../../utils";
 import { EDITABLE_FEE_FAMILIES } from "@ledgerhq/live-common/exchange/swap/const/blockchain";
 import { useMaybeAccountName } from "~/reducers/wallet";
 import { useMaybeAccountUnit } from "~/hooks/useAccountUnit";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 interface Props {
   provider?: string;
@@ -49,6 +50,7 @@ export function Summary({ provider, swapTx: { swap, status, transaction } }: Pro
   const exchangeRate = useSelector(rateSelector);
   const ratesExpiration = useSelector(rateExpirationSelector);
   const rawCounterValueCurrency = useSelector(counterValueCurrencySelector);
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
 
   const name = useMemo(() => provider && getProviderName(provider), [provider]);
 
@@ -84,23 +86,44 @@ export function Summary({ provider, swapTx: { swap, status, transaction } }: Pro
     };
 
     if (to.currency.type === "TokenCurrency") {
-      navigation.navigate(NavigatorName.AddAccounts, {
-        screen: ScreenName.AddAccountsTokenCurrencyDisclaimer,
-        params: {
-          ...params,
-          token: to.currency,
-        },
-      });
+      if (llmNetworkBasedAddAccountFlow?.enabled) {
+        navigation.navigate(NavigatorName.AssetSelection, {
+          screen: ScreenName.AddAccountsTokenCurrencyDisclaimer,
+          params: {
+            ...params,
+            token: to.currency,
+          },
+        });
+      } else {
+        navigation.navigate(NavigatorName.AddAccounts, {
+          screen: ScreenName.AddAccountsTokenCurrencyDisclaimer,
+          params: {
+            ...params,
+            token: to.currency,
+          },
+        });
+      }
     } else {
-      navigation.navigate(NavigatorName.AddAccounts, {
-        screen: ScreenName.AddAccountsSelectDevice,
-        params: {
-          ...params,
-          currency: to.currency,
-        },
-      });
+      if (llmNetworkBasedAddAccountFlow?.enabled) {
+        navigation.navigate(NavigatorName.DeviceSelection, {
+          screen: ScreenName.SelectDevice,
+          params: {
+            ...params,
+            currency: to.currency,
+            context: "addAccounts",
+          },
+        });
+      } else {
+        navigation.navigate(NavigatorName.AddAccounts, {
+          screen: ScreenName.AddAccountsSelectDevice,
+          params: {
+            ...params,
+            currency: to.currency,
+          },
+        });
+      }
     }
-  }, [navigation, to, track]);
+  }, [navigation, to, track, llmNetworkBasedAddAccountFlow?.enabled]);
 
   const counterValueCurrency = to.currency || rawCounterValueCurrency;
   const effectiveUnit = from.currency?.units[0];
diff --git a/apps/ledger-live-mobile/src/screens/Swap/SubScreens/SelectAccount.tsx b/apps/ledger-live-mobile/src/screens/Swap/SubScreens/SelectAccount.tsx
index baf8e27d8436..03af2952c841 100644
--- a/apps/ledger-live-mobile/src/screens/Swap/SubScreens/SelectAccount.tsx
+++ b/apps/ledger-live-mobile/src/screens/Swap/SubScreens/SelectAccount.tsx
@@ -21,10 +21,11 @@ import { accountsSelector } from "~/reducers/accounts";
 import { sharedSwapTracking } from "../utils";
 import { walletSelector } from "~/reducers/wallet";
 import { accountNameWithDefaultSelector } from "@ledgerhq/live-wallet/store";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 export function SelectAccount({ navigation, route: { params } }: SelectAccountParamList) {
   const { provider, target, selectableCurrencyIds, selectedCurrency } = params;
-
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
   const { track } = useAnalytics();
   const unfilteredAccounts = useSelector(accountsSelector);
 
@@ -146,19 +147,34 @@ export function SelectAccount({ navigation, route: { params } }: SelectAccountPa
       account: "account",
       button: "new source account",
     });
-    // @ts-expect-error navigation type is only partially declared
-    navigation.navigate(NavigatorName.AddAccounts, {
-      screen: ScreenName.AddAccountsSelectCrypto,
-      params: {
-        returnToSwap: true,
-        filterCurrencyIds: selectableCurrencyIds,
-        onSuccess: () => {
-          navigation.navigate(ScreenName.SwapSelectAccount, params);
+    if (llmNetworkBasedAddAccountFlow?.enabled) {
+      navigation.navigate(NavigatorName.AssetSelection, {
+        screen: ScreenName.AddAccountsSelectCrypto,
+        params: {
+          returnToSwap: true,
+          filterCurrencyIds: selectableCurrencyIds,
+          onSuccess: () => {
+            navigation.navigate(ScreenName.SwapSelectAccount, params);
+          },
+          analyticsPropertyFlow: "swap",
+          context: "addAccounts",
         },
-        analyticsPropertyFlow: "swap",
-      },
-    });
-  }, [navigation, params, selectableCurrencyIds, track]);
+      });
+    } else {
+      // @ts-expect-error navigation type is only partially declared
+      navigation.navigate(NavigatorName.AddAccounts, {
+        screen: ScreenName.AddAccountsSelectCrypto,
+        params: {
+          returnToSwap: true,
+          filterCurrencyIds: selectableCurrencyIds,
+          onSuccess: () => {
+            navigation.navigate(ScreenName.SwapSelectAccount, params);
+          },
+          analyticsPropertyFlow: "swap",
+        },
+      });
+    }
+  }, [navigation, params, selectableCurrencyIds, track, llmNetworkBasedAddAccountFlow?.enabled]);
 
   const renderList = useCallback(
     (items: typeof allAccounts) => {
diff --git a/apps/ledger-live-mobile/src/screens/WalletCentricAsset/index.tsx b/apps/ledger-live-mobile/src/screens/WalletCentricAsset/index.tsx
index cf50cfb9d7c4..55e5b3e6bcce 100644
--- a/apps/ledger-live-mobile/src/screens/WalletCentricAsset/index.tsx
+++ b/apps/ledger-live-mobile/src/screens/WalletCentricAsset/index.tsx
@@ -36,6 +36,7 @@ import { View } from "react-native-animatable";
 import Alert from "~/components/Alert";
 import { urls } from "~/utils/urls";
 import { CurrencyConfig } from "@ledgerhq/coin-framework/config";
+import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 
 const AnimatedFlatListWithRefreshControl = Animated.createAnimatedComponent(
   accountSyncRefreshControl(FlatList),
@@ -48,6 +49,7 @@ type NavigationProps = BaseComposite<
 const AssetScreen = ({ route }: NavigationProps) => {
   const { t } = useTranslation();
   const { colors } = useTheme();
+  const llmNetworkBasedAddAccountFlow = useFeature("llmNetworkBasedAddAccountFlow");
   const navigation = useNavigation<NavigationProps["navigation"]>();
   const { currency } = route?.params;
   const cryptoAccounts = useSelector(
@@ -85,20 +87,29 @@ const AssetScreen = ({ route }: NavigationProps) => {
     track("button_clicked", {
       button: "Add new",
     });
-    if (currency && currency.type === "TokenCurrency") {
-      navigation.navigate(NavigatorName.AddAccounts, {
-        screen: undefined,
-        params: {
-          token: currency,
-        },
+    if (llmNetworkBasedAddAccountFlow?.enabled) {
+      navigation.navigate(NavigatorName.AssetSelection, {
+        ...(currency && currency.type === "TokenCurrency"
+          ? { token: currency.id }
+          : { currency: currency.id }),
+        context: "addAccounts",
       });
     } else {
-      navigation.navigate(NavigatorName.AddAccounts, {
-        screen: undefined,
-        currency,
-      });
+      if (currency && currency.type === "TokenCurrency") {
+        navigation.navigate(NavigatorName.AddAccounts, {
+          screen: undefined,
+          params: {
+            token: currency,
+          },
+        });
+      } else {
+        navigation.navigate(NavigatorName.AddAccounts, {
+          screen: undefined,
+          currency,
+        });
+      }
     }
-  }, [currency, navigation]);
+  }, [currency, navigation, llmNetworkBasedAddAccountFlow]);
 
   let currencyConfig: CurrencyConfig | undefined = undefined;
   if (isCryptoCurrency(currency)) {
diff --git a/libs/ledger-live-common/src/deposit/deposit.integration.test.ts b/libs/ledger-live-common/src/deposit/deposit.integration.test.ts
index c1ce7f1ea469..384364aa7a58 100644
--- a/libs/ledger-live-common/src/deposit/deposit.integration.test.ts
+++ b/libs/ledger-live-common/src/deposit/deposit.integration.test.ts
@@ -4,13 +4,31 @@
 import "../__tests__/test-helpers/setup";
 import { renderHook, waitFor } from "@testing-library/react";
 import { useGroupedCurrenciesByProvider } from ".";
+import { GroupedCurrencies, LoadingBasedGroupedCurrencies } from "./type";
+// Explicitly mock the featureFlags module
 
-test("list is starting with Bitcoin", async () => {
-  const { result } = renderHook(() => useGroupedCurrenciesByProvider());
+describe("useGroupedCurrenciesByProvider", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it("should list is starting with Bitcoin", async () => {
+    const { result } = renderHook(() => useGroupedCurrenciesByProvider());
+    await waitFor(() =>
+      expect(
+        (result.current as GroupedCurrencies).sortedCryptoCurrencies.slice(0, 1).map(o => o.id),
+      ).toMatchObject(["bitcoin"]),
+    );
+  });
 
-  await waitFor(() =>
-    expect(result.current.sortedCryptoCurrencies.slice(0, 1).map(o => o.id)).toMatchObject([
-      "bitcoin",
-    ]),
-  );
+  it("should list is starting with Bitcoin when withLoading is activated", async () => {
+    const { result: hookRef } = renderHook(() => useGroupedCurrenciesByProvider(true));
+
+    await waitFor(() =>
+      expect(
+        (hookRef.current as LoadingBasedGroupedCurrencies).result.sortedCryptoCurrencies
+          .slice(0, 1)
+          .map(o => o.id),
+      ).toMatchObject(["bitcoin"]),
+    );
+  });
 });
diff --git a/libs/ledger-live-common/src/deposit/type.ts b/libs/ledger-live-common/src/deposit/type.ts
index 4edbf28e1de9..e84752a698ba 100644
--- a/libs/ledger-live-common/src/deposit/type.ts
+++ b/libs/ledger-live-common/src/deposit/type.ts
@@ -31,3 +31,8 @@ export type GroupedCurrencies = {
   currenciesByProvider: CurrenciesByProviderId[];
   sortedCryptoCurrencies: CryptoOrTokenCurrency[];
 };
+
+export type LoadingBasedGroupedCurrencies = {
+  result: GroupedCurrencies;
+  loadingStatus: "idle" | "pending" | "success" | "error";
+};
diff --git a/libs/ledger-live-common/src/deposit/useGroupedCurrenciesByProvider.hook.ts b/libs/ledger-live-common/src/deposit/useGroupedCurrenciesByProvider.hook.ts
index 32861b38b065..8fe801adc0a7 100644
--- a/libs/ledger-live-common/src/deposit/useGroupedCurrenciesByProvider.hook.ts
+++ b/libs/ledger-live-common/src/deposit/useGroupedCurrenciesByProvider.hook.ts
@@ -1,4 +1,4 @@
-import { GroupedCurrencies } from "./type";
+import { GroupedCurrencies, LoadingBasedGroupedCurrencies } from "./type";
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { useEffect, useMemo, useState } from "react";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
@@ -12,9 +12,14 @@ const initialResult: GroupedCurrencies = {
   currenciesByProvider: [],
 };
 
-export const useGroupedCurrenciesByProvider = () => {
+export const useGroupedCurrenciesByProvider = (
+  withLoading?: boolean,
+): GroupedCurrencies | LoadingBasedGroupedCurrencies => {
   const [result, setResult] = useState(initialResult);
 
+  const [loadingStatus, setLoadingStatus] = useState<"idle" | "pending" | "success" | "error">(
+    "idle",
+  );
   const coinsAndTokensSupported = useMemo(
     () => (listSupportedCurrencies() as CryptoOrTokenCurrency[]).concat(listSupportedTokens()),
     [],
@@ -22,8 +27,17 @@ export const useGroupedCurrenciesByProvider = () => {
 
   // Get mapped assets filtered by supported & sorted currencies, grouped by provider id
   useEffect(() => {
-    loadCurrenciesByProvider(coinsAndTokensSupported).then(setResult);
-  }, [coinsAndTokensSupported]);
-
-  return result;
+    if (withLoading) {
+      setLoadingStatus("pending");
+      loadCurrenciesByProvider(coinsAndTokensSupported)
+        .then(data => {
+          setResult(data);
+          setLoadingStatus("success");
+        })
+        .catch(() => setLoadingStatus("error"));
+    } else {
+      loadCurrenciesByProvider(coinsAndTokensSupported).then(setResult);
+    }
+  }, [coinsAndTokensSupported, withLoading]);
+  return withLoading ? { result, loadingStatus } : result;
 };