Merge branch 'feat/sf-801' into feat/sf-802

Consensys · Feb 13, 2025 · 0b7c3f7 · 0b7c3f7
2 parents c62c00f + 385d106
commit 0b7c3f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/packages/starknet-snap/src/rpcs/set-account-name.test.ts b/packages/starknet-snap/src/rpcs/set-account-name.test.ts
@@ -22,8 +22,9 @@ describe('SetAccountName', () => {
 
     mockAccountContractReader({});
 
-    const { getAccountSpy } = mockAccountStateManager();
+    const { getAccountSpy, getCurrentAccountSpy } = mockAccountStateManager();
     getAccountSpy.mockResolvedValue(await account.serialize());
+    getCurrentAccountSpy.mockResolvedValue(await account.serialize());
 
     const deriveAccountByAddressSpy = jest.spyOn(
       AccountService.prototype,

diff --git a/packages/starknet-snap/src/rpcs/set-account-name.ts b/packages/starknet-snap/src/rpcs/set-account-name.ts
@@ -47,7 +47,7 @@ export class SetAccountNameRpc extends AccountRpcController<
   protected async handleRequest(
     params: SetAccountNameParams,
   ): Promise<SetAccountNameResponse> {
-    const { accountName } = params;
+    const { accountName, chainId } = params;
 
     const accMgt = new AccountStateManager();
 
@@ -56,7 +56,9 @@ export class SetAccountNameRpc extends AccountRpcController<
       accountName,
     });
 
-    return (await this.account.serialize()) as SetAccountNameResponse;
+    return (await accMgt.getCurrentAccount({
+      chainId,
+    })) as SetAccountNameResponse;
   }
 }
 

diff --git a/packages/starknet-snap/src/wallet/account/service.test.ts b/packages/starknet-snap/src/wallet/account/service.test.ts
@@ -310,7 +310,10 @@ describe('AccountService', () => {
       expect(result).toStrictEqual(accountObj);
       expect(addAccountSpy).toHaveBeenCalledWith(accountJsonData);
       expect(setCurrentAccountSpy).toHaveBeenCalledWith(accountJsonData);
-      expect(deriveAccountByIndexSpy).toHaveBeenCalledWith(nextIndex, undefined);
+      expect(deriveAccountByIndexSpy).toHaveBeenCalledWith(
+        nextIndex,
+        undefined,
+      );
     });
   });
 });