Merge pull request #2095 from getAlby/task-account-error

fix: show toast if nostr key is malformed
getAlby · Feb 10, 2023 · 13b8148 · 13b8148
2 parents 896bd4a + 0937f2a
commit 13b8148
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/app/screens/Accounts/Show/index.tsx b/src/app/screens/Accounts/Show/index.tsx
@@ -231,13 +231,24 @@ function AccountScreen() {
   }, [fetchData, isLoadingSettings]);
 
   useEffect(() => {
-    setNostrPublicKey(
-      currentPrivateKey ? generatePublicKey(currentPrivateKey) : ""
-    );
-    setNostrPrivateKey(
-      currentPrivateKey ? nostrlib.hexToNip19(currentPrivateKey, "nsec") : ""
-    );
-  }, [currentPrivateKey]);
+    try {
+      setNostrPublicKey(
+        currentPrivateKey ? generatePublicKey(currentPrivateKey) : ""
+      );
+      setNostrPrivateKey(
+        currentPrivateKey ? nostrlib.hexToNip19(currentPrivateKey, "nsec") : ""
+      );
+    } catch (e) {
+      if (e instanceof Error)
+        toast.error(
+          <p>
+            {t("nostr.errors.failed_to_load")}
+            <br />
+            {e.message}
+          </p>
+        );
+    }
+  }, [currentPrivateKey, t]);
 
   return !account ? (
     <div className="flex justify-center mt-5">

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -417,6 +417,9 @@
           },
           "actions": {
             "generate": "Generate a new key"
+          },
+          "errors": {
+            "failed_to_load": "Failed to load the Nostr key. Is it a valid Nostr key?"
           }
         },
         "remove": {