work on the issue #2452

okTurtles · Dec 11, 2024 · c067327 · c067327
1 parent 7b1c2b3
commit c067327
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/frontend/controller/actions/group-kv.js b/frontend/controller/actions/group-kv.js
@@ -3,10 +3,15 @@ import sbp from '@sbp/sbp'
 import { KV_KEYS, LAST_LOGGED_IN_THROTTLE_WINDOW } from '~/frontend/utils/constants.js'
 import { KV_QUEUE, ONLINE } from '~/frontend/utils/events.js'
 
-sbp('okTurtles.events/on', ONLINE, () => {
-  sbp('gi.actions/group/kv/load').catch(e => {
-    console.error("Error from 'gi.actions/identity/kv/load' after reestablished connection:", e)
-  })
+sbp('okTurtles.events/on', ONLINE, async () => {
+  try {
+    const identityContractID = (await sbp('chelonia/rootState')).loggedIn?.identityContractID
+    if (identityContractID) {
+      await sbp('gi.actions/group/kv/load')
+    }
+  } catch (e) {
+    console.error("Error from 'gi.actions/group/kv/load' after reestablished connection:", e)
+  }
 })
 
 export default (sbp('sbp/selectors/register', {

diff --git a/frontend/controller/actions/identity-kv.js b/frontend/controller/actions/identity-kv.js
@@ -6,10 +6,15 @@ import { isExpired } from '@model/notifications/utils.js'
 
 const initNotificationStatus = (data = {}) => ({ ...data, read: false })
 
-sbp('okTurtles.events/on', ONLINE, () => {
-  sbp('gi.actions/identity/kv/load').catch(e => {
+sbp('okTurtles.events/on', ONLINE, async () => {
+  try {
+    const identityContractID = (await sbp('chelonia/rootState')).loggedIn?.identityContractID
+    if (identityContractID) {
+      await sbp('gi.actions/identity/kv/load')
+    }
+  } catch (e) {
     console.error("Error from 'gi.actions/identity/kv/load' after reestablished connection:", e)
-  })
+  }
 })
 
 export default (sbp('sbp/selectors/register', {
@@ -25,7 +30,7 @@ export default (sbp('sbp/selectors/register', {
     // Using 'chelonia/rootState' here as 'state/vuex/state' is not available
     // in the SW, and because, even without a SW, 'loggedIn' is not yet there
     // in Vuex state when logging in
-    const identityContractID = sbp('chelonia/rootState').loggedIn?.identityContractID
+    const identityContractID = (await sbp('chelonia/rootState')).loggedIn?.identityContractID
     if (!identityContractID) {
       throw new Error('Unable to fetch chatroom unreadMessages without an active session')
     }