fix(Account#setData): re-init in actions if localRoot is changed

instead of in Account#setData Signed-off-by: Marcel Klehr <[email protected]>
floccusaddon · Dec 31, 2023 · e05cf0a · e05cf0a
1 parent 4e06ebb
commit e05cf0a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/lib/Account.ts b/src/lib/Account.ts
@@ -111,9 +111,6 @@ export default class Account {
   }
 
   async setData(data:IAccountData):Promise<void> {
-    if (this.getData().localRoot !== data.localRoot) {
-      this.init()
-    }
     await this.storage.setAccountData(data, null)
     this.server.setData(data)
   }

diff --git a/src/ui/store/actions.js b/src/ui/store/actions.js
@@ -69,7 +69,11 @@ export const actionsDefinition = {
   },
   async [actions.STORE_ACCOUNT]({ commit, dispatch, state }, { id,data }) {
     const account = await Account.get(id)
+    const oldData = account.getData()
     await account.setData(data)
+    if (oldData.localRoot !== data.localRoot) {
+      await account.init()
+    }
     commit(mutations.STORE_ACCOUNT_DATA, {id, data})
   },
   async [actions.TRIGGER_SYNC]({ commit, dispatch, state }, accountId) {

diff --git a/src/ui/store/native/actions.js b/src/ui/store/native/actions.js
@@ -137,7 +137,11 @@ export const actionsDefinition = {
   },
   async [actions.STORE_ACCOUNT]({ commit, dispatch, state }, { id,data }) {
     const account = await Account.get(id)
+    const oldData = account.getData()
     await account.setData(data)
+    if (oldData.localRoot !== data.localRoot) {
+      await account.init()
+    }
     commit(mutations.STORE_ACCOUNT_DATA, {id, data})
   },
   async [actions.TRIGGER_SYNC]({ commit, dispatch, state }, accountId) {