fix(): throw error

Brillionfi · Dec 11, 2024 · 36847ae · 36847ae
1 parent 67062bf
commit 36847ae
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 71 deletions.
diff --git a/src/components/LoginForm.tsx b/src/components/LoginForm.tsx
@@ -17,61 +17,61 @@ export const LoginForm = ({loginMethods, redirectUrl, customProps}: {loginMethod
   const [showEmail, setShowEmail] = useState<boolean>(false);
   const [isVisible, setIsVisible] = useState<boolean>(false);
   const [email, setEmail] = useState<string>("");
+  const [errorText, setErrorText] = useState<string>("");
+
+  const makeLogin = async (provider: AuthProvider, redirectUrl: string, redirect: boolean, email?: string) => {
+    try {
+      const url = await login(provider, redirectUrl, email);
+      if (url) {
+        redirect ? 
+          window.location.href = url 
+        : 
+          QRCodeModal.open(url, () => {});
+      }
+    } catch (error) {
+      setErrorText((error as Error).message);
+    }
+  }
 
   const options: TLoginOptions = [
     {
       label: LoginMethods.Google,
       icon: <GoogleLogo />,
       disabled: false,
       onClick: async () => {
-        const url = await login(AuthProvider.GOOGLE, redirectUrl);
-        if (url) {
-          window.location.href = url;
-        }
+        await makeLogin(AuthProvider.GOOGLE, redirectUrl, true);
       },
     },
     {
       label: LoginMethods.Discord,
       icon: <TwitterLogo />,
       disabled: false,
       onClick: async () => {
-        const url = await login(AuthProvider.DISCORD, redirectUrl);
-        if (url) {
-          window.location.href = url;
-        }
+        await makeLogin(AuthProvider.DISCORD, redirectUrl, true);
       },
     },
     {
       label: LoginMethods.Twitter,
       icon: <DiscordLogo />,
       disabled: false,
       onClick: async () => {
-        const url = await login(AuthProvider.TWITTER, redirectUrl);
-        if (url) {
-          window.location.href = url;
-        }
+        await makeLogin(AuthProvider.TWITTER, redirectUrl, true);
       },
     },
     {
       label: LoginMethods.Metamask,
       icon: <MetamaskLogo />,
       disabled: false,
       onClick: async () => {
-        const url = await login(AuthProvider.METAMASK, redirectUrl);
-        if (url) {
-          window.location.href = url;
-        }
+        await makeLogin(AuthProvider.METAMASK, redirectUrl, true);
       },
     },
     {
       label: LoginMethods.WalletConnect,
       icon: <WalletConnectLogo />,
       disabled: false,
       onClick: async () => {
-        const url = await login(AuthProvider.WALLET_CONNECT, redirectUrl);
-        if(!url) return;
-
-        QRCodeModal.open(url, () => {});
+        await makeLogin(AuthProvider.WALLET_CONNECT, redirectUrl, false);
       },
     },
     {
@@ -136,10 +136,7 @@ export const LoginForm = ({loginMethods, redirectUrl, customProps}: {loginMethod
             />
             <button
               onClick={async () => {
-                const url = await login(AuthProvider.EMAIL, redirectUrl, email);
-                if (url) {
-                  window.location.href = url;
-                }
+                await makeLogin(AuthProvider.EMAIL, redirectUrl, true, email);
               }
             }
               style={{
@@ -165,6 +162,8 @@ export const LoginForm = ({loginMethods, redirectUrl, customProps}: {loginMethod
   const buttonsContainerStyle = customProps?.buttonsContainerStyle ? customProps.buttonsContainerStyle : defaultStyles.buttonsContainer;
   const buttonStyle = customProps?.buttonStyle ? customProps.buttonStyle : defaultStyles.button;
   const buttonText = customProps?.buttonText ? customProps.buttonText : "Continue with";
+  const errorContainerStyle = customProps?.errorContainerStyle ? customProps.errorContainerStyle : defaultStyles.errorContainer;
+  const errorTextStyle = customProps?.errorTextStyle ? customProps.errorTextStyle : defaultStyles.errorStyle;
 
   return (
     <div style={containerStyle}>
@@ -192,6 +191,11 @@ export const LoginForm = ({loginMethods, redirectUrl, customProps}: {loginMethod
           </button>
         ))}
       </section>
+      <section style={errorContainerStyle}>
+        <span style={errorTextStyle}>
+          {errorText}
+        </span>
+      </section>
     </div>
   );
 };
diff --git a/src/components/LoginFormStyles.tsx b/src/components/LoginFormStyles.tsx
@@ -6,6 +6,8 @@ export type TCustomProps = {
   tittleStyle?: React.CSSProperties;
   tittleText?: string;
   buttonText?: string;
+  errorContainerStyle?: React.CSSProperties;
+  errorTextStyle?: React.CSSProperties;
 };
 
 const container: React.CSSProperties = {
@@ -60,10 +62,20 @@ const tittle: React.CSSProperties = {
   color: "#fff",
 }
 
+const errorContainer: React.CSSProperties = {
+  marginTop: "1rem",
+}
+
+const errorStyle: React.CSSProperties = {  
+  color: "red",
+}
+
 export const defaultStyles = {
   container,
   buttonsContainer,
   button,
   buttonText,
-  tittle
+  tittle,
+  errorContainer,
+  errorStyle,
 }
diff --git a/src/hooks/useBalance.ts b/src/hooks/useBalance.ts
@@ -11,8 +11,7 @@ export const useBalance = (address?: Address, chainId?: ChainId) => {
     queryFn: async () => {
       if (!chainId || !address) throw new Error("Missing chainId or address");
       if (!sdk) {
-        console.error("AppId is not loaded");
-        return;
+        throw new Error("AppId is not valid");
       }
 
       const response = await sdk.Wallet.getPortfolio(address, chainId);
@@ -23,8 +22,7 @@ export const useBalance = (address?: Address, chainId?: ChainId) => {
 
   const getBalances = async (address: Address, chainId: ChainId) => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     const response = await sdk.Wallet.getPortfolio(address, chainId);
     return response?.portfolio || [];
@@ -35,8 +33,7 @@ export const useBalance = (address?: Address, chainId?: ChainId) => {
     chainId: ChainId,
   ): Promise<IWalletPortfolio | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.getPortfolio(address, chainId);
   };

diff --git a/src/hooks/useTransaction.ts b/src/hooks/useTransaction.ts
@@ -13,8 +13,7 @@ export const useTransaction = () => {
     transaction: ITransactionSigned | ITransactionUnsigned,
   ): Promise<ITransaction | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Transaction.createTransaction(transaction);
   };
@@ -23,16 +22,14 @@ export const useTransaction = () => {
     id: string,
   ): Promise<ITransaction | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Transaction.getTransactionById(id);
   };
 
   const cancelTransaction = async (id: string): Promise<void | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Transaction.cancelTransaction(id);
   };
@@ -44,8 +41,7 @@ export const useTransaction = () => {
     fromOrigin: string,
   ): Promise<ISignTransactionResponse | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Transaction.approveSignTransaction(
       id,
@@ -62,8 +58,7 @@ export const useTransaction = () => {
     fromOrigin: string,
   ): Promise<ISignTransactionResponse | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Transaction.rejectSignTransaction(
       id,

diff --git a/src/hooks/useUser.ts b/src/hooks/useUser.ts
@@ -8,8 +8,7 @@ export const useUser = () => {
 
   const authenticateUser = (jwt: string) => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
 
     sdk.authenticateUser(jwt);
@@ -21,8 +20,7 @@ export const useUser = () => {
     email?: string,
   ) => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
 
     let uri;

diff --git a/src/hooks/useWallet.ts b/src/hooks/useWallet.ts
@@ -20,8 +20,7 @@ export const useWallet = () => {
 
   const createWallet = async (data: IWallet): Promise<IWallet | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.createWallet(data);
   };
@@ -30,8 +29,7 @@ export const useWallet = () => {
     queryKey: ["wallets"],
     queryFn: async () => {
       if (!sdk) {
-        console.error("AppId is not loaded");
-        return;
+        throw new Error("AppId is not valid");
       }
       return (await sdk.Wallet.getWallets()) as IWallet[];
     },
@@ -43,8 +41,7 @@ export const useWallet = () => {
     fromOrigin: string,
   ): Promise<IWalletSignTransactionResponse | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.signTransaction(address, data, fromOrigin);
   };
@@ -56,8 +53,7 @@ export const useWallet = () => {
     fromOrigin: string,
   ): Promise<IWalletSignTransactionResponse | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.approveTransaction(
       address,
@@ -74,8 +70,7 @@ export const useWallet = () => {
     fromOrigin: string,
   ): Promise<IWalletSignTransactionResponse | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.rejectTransaction(
       address,
@@ -94,8 +89,7 @@ export const useWallet = () => {
     { transactions: Partial<ITransaction>[]; currentPage: number } | undefined
   > => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.getTransactionHistory(
       address,
@@ -110,8 +104,7 @@ export const useWallet = () => {
     chainId: ChainId,
   ): Promise<IWalletGasConfiguration | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.getGasConfig(address, chainId);
   };
@@ -122,8 +115,7 @@ export const useWallet = () => {
     configuration: IWalletGasConfiguration,
   ): Promise<IWalletGasConfigurationAPI | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.setGasConfig(address, chainId, configuration);
   };
@@ -136,8 +128,7 @@ export const useWallet = () => {
     data: string,
   ): Promise<IWalletGasEstimation | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.getGasFees(chainId, from, to, value, data);
   };
@@ -147,8 +138,7 @@ export const useWallet = () => {
     chainId: ChainId,
   ): Promise<number | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.getNonce(address, chainId);
   };
@@ -157,8 +147,7 @@ export const useWallet = () => {
     address: Address,
   ): Promise<IWalletRecovery | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.initRecovery(address);
   };
@@ -171,8 +160,7 @@ export const useWallet = () => {
     fromOrigin: string,
   ): Promise<IExecRecovery | undefined> => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return await sdk.Wallet.execRecovery(
       organizationId,
@@ -185,8 +173,7 @@ export const useWallet = () => {
 
   const getNotifications = async (address: Address, chainId: ChainId) => {
     if (!sdk) {
-      console.error("AppId is not loaded");
-      return;
+      throw new Error("AppId is not valid");
     }
     return (await sdk.Notifications.getNotifications(address, chainId)) as
       | TNotifications