fix(trustchain): 🚦 allow members to sync immediately after getting re…

…moved (#7823)

* fix(trustchain): allow members to sync immedialtely after getting removed

* chore: update change log

* chore: remove unnecessary optional chainings

---------

Co-authored-by: Theophile Sandoz <Theophile Sandoz>

.changeset/forty-panthers-clean.md

@@ -0,0 +1,7 @@
+---
+"@ledgerhq/trustchain": minor
+"ledger-live-desktop": patch
+"live-mobile": patch
+---
+
+Allow members to sync immediately after getting removed

apps/ledger-live-desktop/src/newArch/features/WalletSync/hooks/useAddMember.ts

@@ -76,7 +76,7 @@ export function useAddMember({ device }: { device: Device | null }) {
             onEndRequestUserInteraction: () => setUserDeviceInteraction(false),
           },
           undefined,
-          trustchainRef?.current?.rootId,
+          trustchainRef.current ?? undefined,
         );
 
         transitionToNextScreen(trustchainResult);

apps/ledger-live-mobile/src/newArch/features/WalletSync/hooks/useAddMember.ts

@@ -61,7 +61,7 @@ export function useAddMember({ device }: { device: Device | null }): DrawerProps
             onEndRequestUserInteraction: () => setScene({ kind: SceneKind.Loader }),
           },
           undefined,
-          trustchainRef?.current?.rootId,
+          trustchainRef.current ?? undefined,
         );
         if (trustchainResult) {
           transitionToNextScreen(trustchainResult);

libs/trustchain/src/sdk.ts

@@ -104,7 +104,7 @@ export class SDK implements TrustchainSDK {
     memberCredentials: MemberCredentials,
     callbacks?: GetOrCreateTrustchainCallbacks,
     topic?: Uint8Array,
-    currentTrustchainId?: string,
+    currentTrustchain?: Trustchain,
   ): Promise<TrustchainResult> {
     this.invalidateJwt();
 
@@ -118,13 +118,17 @@ export class SDK implements TrustchainSDK {
 
     callbacks?.onInitialResponse?.(trustchains);
 
-    if (currentTrustchainId) {
-      if (
-        Object.keys(trustchains).length > 0 &&
-        Object.keys(trustchains).find(key => key === currentTrustchainId)
-      ) {
-        throw new TrustchainAlreadyInitialized();
-      } else throw new TrustchainAlreadyInitializedWithOtherSeed();
+    if (currentTrustchain) {
+      await this.restoreTrustchain(currentTrustchain, memberCredentials).then(
+        () => {
+          throw Object.keys(trustchains).includes(currentTrustchain.rootId)
+            ? new TrustchainAlreadyInitialized()
+            : new TrustchainAlreadyInitializedWithOtherSeed();
+        },
+        () => {
+          // The user was ejected from the trustchain therefore we can continue
+        },
+      );
     }
 
     if (Object.keys(trustchains).length === 0) {

libs/trustchain/src/types.ts

@@ -175,7 +175,7 @@ export interface TrustchainSDK {
     memberCredentials: MemberCredentials,
     callbacks?: GetOrCreateTrustchainCallbacks,
     topic?: Uint8Array,
-    currentTrustchainId?: string,
+    currentTrustchain?: Trustchain,
   ): Promise<TrustchainResult>;
 
   /**