From 45a27dc196db6e06df5952ac1167f5e3449bd796 Mon Sep 17 00:00:00 2001
From: Martin CAYUELAS <112866305+mcayuelas-ledger@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:58:42 +0200
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=92=84=20Update=20Sync=20flow=20L?=
 =?UTF-8?q?edgerSync=20(#7854)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/cyan-lamps-unite.md                             | 5 +++++
 .../Accounts/screens/AddAccount/components/StepFlow.tsx    | 7 ++++++-
 .../newArch/features/WalletSync/screens/Manage/index.tsx   | 3 +--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/cyan-lamps-unite.md

diff --git a/.changeset/cyan-lamps-unite.md b/.changeset/cyan-lamps-unite.md
new file mode 100644
index 000000000000..eb8dc2aa813b
--- /dev/null
+++ b/.changeset/cyan-lamps-unite.md
@@ -0,0 +1,5 @@
+---
+"live-mobile": patch
+---
+
+Block users from syncing with device if Ledger Sync is active on instance
diff --git a/apps/ledger-live-mobile/src/newArch/features/Accounts/screens/AddAccount/components/StepFlow.tsx b/apps/ledger-live-mobile/src/newArch/features/Accounts/screens/AddAccount/components/StepFlow.tsx
index 5f0b869bf3ae..6d284c4a6852 100644
--- a/apps/ledger-live-mobile/src/newArch/features/Accounts/screens/AddAccount/components/StepFlow.tsx
+++ b/apps/ledger-live-mobile/src/newArch/features/Accounts/screens/AddAccount/components/StepFlow.tsx
@@ -16,6 +16,8 @@ import { ErrorReason } from "LLM/features/WalletSync/hooks/useSpecificError";
 import { useCurrentStep } from "LLM/features/WalletSync/hooks/useCurrentStep";
 import ScannedInvalidQrCode from "~/newArch/features/WalletSync/screens/Synchronize/ScannedInvalidQrCode";
 import ScannedOldImportQrCode from "~/newArch/features/WalletSync/screens/Synchronize/ScannedOldImportQrCode";
+import { useSelector } from "react-redux";
+import { trustchainSelector } from "@ledgerhq/trustchain/store";
 
 type Props = {
   currency?: CryptoCurrency | TokenCurrency | null;
@@ -47,6 +49,7 @@ const StepFlow = ({
 }: Props) => {
   const { currentStep, setCurrentStep } = useCurrentStep();
   const { memberCredentials } = useInitMemberCredentials();
+  const trustchain = useSelector(trustchainSelector);
 
   const { handleStart, handleSendDigits, inputCallback, nbDigits } = useSyncWithQrCode();
 
@@ -68,7 +71,9 @@ const StepFlow = ({
             <SelectAddAccountMethod
               doesNotHaveAccount={doesNotHaveAccount}
               currency={currency}
-              setWalletSyncDrawerVisible={navigateToChooseSyncMethod}
+              setWalletSyncDrawerVisible={
+                trustchain?.rootId ? navigateToQrCodeMethod : navigateToChooseSyncMethod
+              }
             />
           </>
         );
diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/Manage/index.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/Manage/index.tsx
index 7e31acc7a853..61a0de389624 100644
--- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/Manage/index.tsx
+++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/Manage/index.tsx
@@ -27,7 +27,6 @@ const WalletSyncManage = () => {
 
   const manageKeyHook = useManageKeyDrawer();
   const manageInstancesHook = useManageInstancesDrawer();
-
   const { error: ledgerSyncError, isError: isLedgerSyncError } = useLedgerSyncStatus();
 
   const {
@@ -168,7 +167,7 @@ const WalletSyncManage = () => {
           </InstancesRow>
 
           <ActivationDrawer
-            startingStep={Steps.ChooseSyncMethod}
+            startingStep={Steps.QrCodeMethod}
             isOpen={isSyncDrawerOpen}
             handleClose={closeSyncDrawer}
           />