fix: reset lock screen issue

enkryptcom · Jan 19, 2024 · 6e12049 · 6e12049 · github-actions · Jan 19, 2024
1 parent c2ca03c
commit 6e12049
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue
@@ -76,7 +76,11 @@
       @update:active-networks="setActiveNetworks"
     />
 
-    <settings v-if="settingsShow" @close:popup="settingsShow = !settingsShow" />
+    <settings
+      v-if="settingsShow"
+      @close:popup="settingsShow = !settingsShow"
+      @action:lock="lockAction"
+    />
     <modal-rate v-if="rateShow" @close:popup="rateShow = !rateShow" />
     <modal-new-version
       v-if="updateShow"

diff --git a/packages/extension/src/ui/action/views/reset-wallet/index.vue b/packages/extension/src/ui/action/views/reset-wallet/index.vue
@@ -48,6 +48,10 @@ import BaseInput from "@action/components/base-input/index.vue";
 import KeyRingBase from "@/libs/keyring/keyring";
 import openOnboard from "@/libs/utils/open-onboard";
 
+const emit = defineEmits<{
+  (e: "action:lock"): void;
+}>();
+
 const reset = ref("");
 const isProcessing = ref(false);
 
@@ -63,6 +67,7 @@ const resetAction = async () => {
   isProcessing.value = true;
   const keyring = new KeyRingBase();
   await keyring.reset();
+  emit("action:lock");
   openOnboard();
 };
 </script>

diff --git a/packages/extension/src/ui/action/views/settings/index.vue b/packages/extension/src/ui/action/views/settings/index.vue
@@ -34,6 +34,7 @@
       />
       <reset-wallet
         v-if="isReset"
+        v-bind="$attrs"
         @window:close="close"
         @window:back="startAction"
       />

diff --git a/packages/keyring/src/index.ts b/packages/keyring/src/index.ts
@@ -334,6 +334,7 @@ class KeyRing {
   }
 
   async reset(): Promise<void> {
+    this.lock();
     const resetPromises = Object.values(configs.STORAGE_KEYS).map((name) =>
       this.#storage.remove(name)
     );