Fix / AccountPersonalize screen issue

src/controllers/accountPicker/accountPicker.test.ts

@@ -120,7 +120,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     const hdPathTemplate = BIP44_STANDARD_DERIVATION_TEMPLATE
-    controller.setInitParams({ keyIterator, hdPathTemplate })
+    controller.setInitParams({ sessionId: 'test', keyIterator, hdPathTemplate })
     await controller.init()
     expect(controller.page).toEqual(DEFAULT_PAGE)
     expect(controller.pageSize).toEqual(DEFAULT_PAGE_SIZE)
@@ -171,6 +171,7 @@ describe('AccountPicker', () => {
       })
 
       controller.setInitParams({
+        sessionId: 'test',
         keyIterator: null,
         hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE
       })
@@ -185,6 +186,7 @@ describe('AccountPicker', () => {
     const PAGE_SIZE = 5
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       pageSize: PAGE_SIZE,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
@@ -208,6 +210,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       pageSize: 3,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
@@ -243,6 +246,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       pageSize: 1,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
@@ -265,6 +269,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       pageSize: 1,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
@@ -288,6 +293,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
       shouldSearchForLinkedAccounts: false,
@@ -310,6 +316,7 @@ describe('AccountPicker', () => {
     const { controller } = await prepareTest()
     const keyIterator = new KeyIterator(process.env.SEED)
     controller.setInitParams({
+      sessionId: 'test',
       keyIterator,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
       shouldSearchForLinkedAccounts: false,
@@ -338,6 +345,7 @@ describe('AccountPicker', () => {
       const keyIterator = new KeyIterator(process.env.SEED)
       const pageSize = 5
       controller.setInitParams({
+        sessionId: 'test',
         keyIterator,
         hdPathTemplate: value,
         pageSize,

src/controllers/accountPicker/accountPicker.ts

@@ -75,6 +75,7 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
   #externalSignerControllers: ExternalSignerControllers
 
   initParams: {
+    sessionId: string
     keyIterator: KeyIterator | null
     hdPathTemplate: HD_PATH_TEMPLATE_TYPE
     page?: number
@@ -409,6 +410,7 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
   }
 
   setInitParams(params: {
+    sessionId: string
     keyIterator: KeyIterator | null
     hdPathTemplate: HD_PATH_TEMPLATE_TYPE
     page?: number

src/controllers/main/main.test.ts

@@ -168,6 +168,7 @@ describe('Main Controller ', () => {
       '0x574f261b776b26b1ad75a991173d0e8ca2ca1d481bd7822b2b58b2ef8a969f12'
     )
     controller.accountPicker.setInitParams({
+      sessionId: 'test',
       keyIterator,
       hdPathTemplate: BIP44_STANDARD_DERIVATION_TEMPLATE,
       shouldAddNextAccountAutomatically: false

src/controllers/main/main.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/brace-style */
 import { ethErrors } from 'eth-rpc-errors'
+import { nanoid } from 'nanoid'
 
 import EmittableError from '../../classes/EmittableError'
 import { AMBIRE_ACCOUNT_FACTORY } from '../../consts/deploy'
@@ -997,6 +998,7 @@ export class MainController extends EventEmitter implements IMainController {
 
       const keyIterator = new LedgerKeyIterator({ controller: ledgerCtrl })
       this.accountPicker.setInitParams({
+        sessionId: nanoid(6),
         keyIterator,
         hdPathTemplate,
         pageSize: 5,
@@ -1031,6 +1033,7 @@ export class MainController extends EventEmitter implements IMainController {
       const hdPathTemplate = BIP44_STANDARD_DERIVATION_TEMPLATE
       const { walletSDK } = trezorCtrl
       await this.accountPicker.setInitParams({
+        sessionId: nanoid(6),
         keyIterator: new TrezorKeyIterator({ walletSDK }),
         hdPathTemplate,
         pageSize: 5,
@@ -1064,6 +1067,7 @@ export class MainController extends EventEmitter implements IMainController {
       const hdPathTemplate = BIP44_STANDARD_DERIVATION_TEMPLATE
 
       await this.accountPicker.setInitParams({
+        sessionId: nanoid(6),
         keyIterator: new LatticeKeyIterator({ controller: latticeCtrl }),
         hdPathTemplate,
         pageSize: 5,
@@ -1090,9 +1094,8 @@ export class MainController extends EventEmitter implements IMainController {
       .filter(([, ops]) => ops.length > 0)
       .map(([addr]) => addr)
 
-    const updatedAccountsOpsByAccount = await this.activity.updateAccountsOpsStatuses(
-      addressesWithPendingOps
-    )
+    const updatedAccountsOpsByAccount =
+      await this.activity.updateAccountsOpsStatuses(addressesWithPendingOps)
 
     Object.values(updatedAccountsOpsByAccount).forEach(
       ({ updatedAccountsOps: accUpdatedAccountsOps }) => {

src/controllers/storage/storage.ts

@@ -1,3 +1,5 @@
+import { nanoid } from 'nanoid'
+
 import { DEFAULT_ACCOUNT_LABEL } from '../../consts/account'
 import { BIP44_STANDARD_DERIVATION_TEMPLATE } from '../../consts/derivation'
 import { IAccountPickerController } from '../../interfaces/accountPicker'
@@ -462,6 +464,7 @@ export class StorageController extends EventEmitter implements IStorageControlle
     const keyIterator = new KeyIterator(keystoreSavedSeed.seed, keystoreSavedSeed.seedPassphrase)
     const accountPicker = accountPickerInitFn()
     await accountPicker.setInitParams({
+      sessionId: nanoid(6),
       keyIterator,
       hdPathTemplate: keystoreSavedSeed.hdPathTemplate,
       pageSize: 10,