diff --git a/src/App.tsx b/src/App.tsx
index dd397c7..bc6876b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -345,13 +345,16 @@ function App() {
useEffect(() => {
try {
+ setIsLoading(true)
chrome.runtime.sendMessage({ action: "getWalletInfo" }, (response) => {
if (response && response?.walletInfo) {
setRawWallet(response?.walletInfo);
setExtstate("authenticated");
}
});
- } catch (error) {}
+ } catch (error) {} finally {
+ setIsLoading(false)
+ }
}, []);
useEffect(() => {
@@ -737,8 +740,14 @@ function App() {
autoComplete="off"
/>
- {sendPaymentError}
- {sendPaymentSuccess}
+
+ {sendPaymentError}
+ {/* {sendPaymentSuccess} */}
{
diff --git a/src/background.ts b/src/background.ts
index 84038c3..9e71175 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -213,7 +213,9 @@ async function getNameOrAddress(receiver) {
}
if (!response?.ok) throw new Error("Cannot fetch name");
return { error: "cannot validate address or name" };
- } catch (error) {}
+ } catch (error) {
+ throw new Error(error?.message || "cannot validate address or name")
+ }
}
async function sendCoin({ password, amount, receiver }) {
try {
@@ -238,7 +240,6 @@ async function sendCoin({ password, amount, receiver }) {
);
return {res, validApi};
} catch (error) {
- console.log({ error });
throw new Error(error.message);
}
}
@@ -301,7 +302,6 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
getBalanceInfo()
.then((balance) => {
sendResponse(balance);
- console.log("balance:", balance);
})
.catch((error) => {
console.error(error.message);
diff --git a/src/utils/validateAddress.ts b/src/utils/validateAddress.ts
index 3df5bae..8b359bf 100644
--- a/src/utils/validateAddress.ts
+++ b/src/utils/validateAddress.ts
@@ -3,10 +3,19 @@
import Base58 from "../deps/Base58"
export const validateAddress = (address) => {
- const decodePubKey = Base58.decode(address)
+ let isAddress = false
+ try {
+ const decodePubKey = Base58.decode(address)
if (!(decodePubKey instanceof Uint8Array && decodePubKey.length == 25)) {
- return false
+ isAddress = false
+ } else {
+ isAddress = true
}
- return true
+
+ } catch (error) {
+
+ }
+
+ return isAddress
}