make better ux if imported account has wrong word in it

scholtz · Oct 21, 2024 · f73e882 · f73e882
1 parent 59d0670
commit f73e882
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 28 deletions.
diff --git a/src/pages/NewAccount/Ed25519.vue b/src/pages/NewAccount/Ed25519.vue
@@ -75,11 +75,14 @@ const makeRandom = () => {
 
 async function skipChallange() {
   try {
-    await store.dispatch("wallet/addPrivateAccount", {
-      mn: state.w,
-      name: state.name,
-    });
-    router.push("/account/" + state.a);
+    if (
+      await store.dispatch("wallet/addPrivateAccount", {
+        mn: state.w,
+        name: state.name,
+      })
+    ) {
+      router.push("/account/" + state.a);
+    }
   } catch (err: any) {
     const error = err.message ?? err;
     console.error("failed to create account", error, err);
@@ -90,11 +93,14 @@ async function skipChallange() {
 async function confirmCreate() {
   try {
     if (state.words[state.r - 1] == state.guess.trim()) {
-      await store.dispatch("wallet/addPrivateAccount", {
-        mn: state.w,
-        name: state.name,
-      });
-      router.push("/account/" + state.a);
+      if (
+        await store.dispatch("wallet/addPrivateAccount", {
+          mn: state.w,
+          name: state.name,
+        })
+      ) {
+        router.push("/account/" + state.a);
+      }
     } else {
       await store.dispatch("toast/openError", "Invalid word");
     }

diff --git a/src/pages/NewAccount/RecoverEd25519.vue b/src/pages/NewAccount/RecoverEd25519.vue
@@ -25,11 +25,14 @@ const router = useRouter();
 
 async function importAccountClick() {
   try {
-    await store.dispatch("wallet/addPrivateAccount", {
-      mn: state.w,
-      name: state.name,
-    });
-    router.push({ name: "Accounts" });
+    if (
+      await store.dispatch("wallet/addPrivateAccount", {
+        mn: state.w,
+        name: state.name,
+      })
+    ) {
+      router.push({ name: "Accounts" });
+    }
   } catch (err) {
     const error = err.message ?? err;
     console.error("failed to create account", error, err);

diff --git a/src/pages/NewAccount/Shamir.vue b/src/pages/NewAccount/Shamir.vue
@@ -119,11 +119,14 @@ const recover = async () => {
     const reassembled = Shamir.combine(bytesArr);
     const mn = algosdk.mnemonicFromSeed(reassembled);
 
-    await store.dispatch("wallet/addPrivateAccount", {
-      mn: mn,
-      name: state.name,
-    });
-    router.push({ name: "Accounts" });
+    if (
+      await store.dispatch("wallet/addPrivateAccount", {
+        mn: mn,
+        name: state.name,
+      })
+    ) {
+      router.push({ name: "Accounts" });
+    }
   } catch (err: any) {
     const error = err?.message ?? err;
     await store.dispatch("toast/openError", error);

diff --git a/src/pages/NewAccount/Vanity.vue b/src/pages/NewAccount/Vanity.vue
@@ -82,11 +82,14 @@ async function confirmCreate() {
   try {
     const words = state.w.split(" ");
     if (words[state.r - 1] == state.guess.trim()) {
-      await store.dispatch("wallet/addPrivateAccount", {
-        mn: state.w,
-        name: state.name,
-      });
-      router.push({ name: "Accounts" });
+      if (
+        await store.dispatch("wallet/addPrivateAccount", {
+          mn: state.w,
+          name: state.name,
+        })
+      ) {
+        router.push({ name: "Accounts" });
+      }
     } else {
       await store.dispatch("toast/openError", "Invalid word");
     }

diff --git a/src/store/wallet.js b/src/store/wallet.js
@@ -370,9 +370,13 @@ const actions = {
       return true;
     } catch (e) {
       console.error("error", e);
-      dispatch("toast/openError", "Account has not been created", {
-        root: true,
-      });
+      dispatch(
+        "toast/openError",
+        "Account has not been created: " + e.message,
+        {
+          root: true,
+        }
+      );
     }
   },
   async addPublicAccount({ dispatch, commit }, { name, addr }) {