chore(trustchain): on removeMember, closeStream with the device for b…

…etter UX (#7357)

libs/trustchain/src/mockSdk.ts

@@ -183,6 +183,10 @@ export class MockSDK implements TrustchainSDK {
     // simulate device interaction
     callbacks?.onEndRequestUserInteraction();
 
+    callbacks?.onStartRequestUserInteraction();
+    // simulate device interaction
+    callbacks?.onEndRequestUserInteraction();
+
     const currentMembers = (trustchainMembers.get(trustchain.rootId) || []).filter(
       m => m.id !== member.id,
     );

libs/trustchain/src/sdk.ts

@@ -229,6 +229,12 @@ export class SDK implements TrustchainSDK {
 
     const newPath = streamTree.getApplicationRootPath(applicationId, 1);
 
+    // We close the current trustchain with the hardware wallet in order to get a user confirmation of the action
+    const sendCloseStreamToAPI = await remapUserInteractions(
+      closeStream(streamTree, applicationRootPath, trustchainId, withJwt, hw),
+      callbacks,
+    );
+
     // derive a new branch of the tree on the new path
     streamTree = await remapUserInteractions(
       pushMember(streamTree, newPath, trustchainId, withJwt, hw, {
@@ -249,14 +255,8 @@ export class SDK implements TrustchainSDK {
       memberCredentials,
     );
 
-    // close the previous stream
-    streamTree = await closeStream(
-      streamTree,
-      applicationRootPath,
-      trustchainId,
-      withJwt,
-      softwareDevice,
-    );
+    // we send the close stream to the API only after the new stream is created in case user cancelled the process in the middle.
+    await sendCloseStreamToAPI();
 
     // deviceJwt have changed, proactively refresh it
     this.deviceJwt = await withJwt(api.refreshAuth);
@@ -480,8 +480,7 @@ async function closeStream(
     path,
     blocks: [crypto.to_hex(commandStream)],
   };
-  await withJwt(jwt => api.putCommands(jwt, trustchainId, request));
-  return streamTree;
+  return () => withJwt(jwt => api.putCommands(jwt, trustchainId, request));
 }
 
 export function convertKeyPairToLiveCredentials(keyPair: CryptoKeyPair): MemberCredentials {

libs/trustchain/tests/scenarios/removingAMemberCreatesAnInteraction.ts

@@ -29,7 +29,7 @@ export async function scenario(transport: Transport, { sdkForName }: ScenarioOpt
   await sdk1.addMember(trustchain, member1creds, member2);
 
   await sdk1.removeMember(transport, trustchain, member1creds, member2, callbacks);
-  expect(totalInteractionCounter).toBe(3); // there are 1 interaction for trustchain addition
+  expect(totalInteractionCounter).toBe(4); // there are 2 interactions for trustchain addition
 
   // destroy the trustchain
   await sdk1.destroyTrustchain(trustchain, member1creds);

libs/trustchain/tests/scenarios/userRefusesRemoveMember.ts

@@ -40,7 +40,7 @@ export async function scenario(transport: Transport, { sdkForName }: ScenarioOpt
     sdk1.removeMember(transport, trustchain, member1creds, member2, callbacks),
   ).rejects.toThrow(UserRefusedOnDevice);
   expect(interactionCounter).toBe(0);
-  expect(totalInteractionCounter).toBe(1);
+  expect(totalInteractionCounter).toBe(2);
 
   // make sure the member2 is still there
   expect(await sdk2.getMembers(trustchain, member2creds)).toEqual([member1, member2]);