Merge pull request #9 from blinklabs-io/chore/merge-tosi-master-main

chore: merge 'tosidrop/master'
blinklabs-io · Sep 21, 2023 · 90e5fa5 · 90e5fa5
2 parents 2ab1af9 + 77b9bac
commit 90e5fa5
Show file tree

Hide file tree

Showing 36 changed files with 142 additions and 131 deletions.
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -19,7 +19,7 @@ function App() {
   const location = useLocation().pathname;
   const dispatch = useDispatch();
   const connectedWallet = useSelector(
-    (state: RootState) => state.wallet.walletApi
+    (state: RootState) => state.wallet.walletApi,
   );
 
   const init = async () => {

diff --git a/client/src/components/BlockchainSelector/index.tsx b/client/src/components/BlockchainSelector/index.tsx
@@ -30,7 +30,7 @@ export default function BlockchainSelector({
 }) {
   const chain = useSelector((state: RootState) => state.global.chain);
   const ergoEnabled = useSelector(
-    (state: RootState) => state.global.ergoEnabled
+    (state: RootState) => state.global.ergoEnabled,
   );
   const network = NETWORK_INFO[chain];
   const { ref, visible, setVisible } = useComponentVisible(false);

diff --git a/client/src/components/Claim/SendAdaInfo/index.tsx b/client/src/components/Claim/SendAdaInfo/index.tsx
@@ -26,10 +26,10 @@ const SendAdaInfo = ({
   setTransactionStatus,
 }: Params) => {
   const connectedWalletApi = useSelector(
-    (state: RootState) => state.wallet.walletApi
+    (state: RootState) => state.wallet.walletApi,
   );
   const isWrongNetwork = useSelector(
-    (state: RootState) => state.wallet.isWrongNetwork
+    (state: RootState) => state.wallet.isWrongNetwork,
   );
   const { transfer, loading: transferLoading } = useTransfer();
 
@@ -82,7 +82,7 @@ const SendAdaInfo = ({
       (txId) => {
         setTransactionStatus(TransactionStatusDetail.processing);
         setTransactionId(txId);
-      }
+      },
     );
   };
 

diff --git a/client/src/components/Claim/TransactionDetail/index.tsx b/client/src/components/Claim/TransactionDetail/index.tsx
@@ -45,7 +45,7 @@ const TransactionDetail = ({
   }, []);
 
   const calcTxFee = () => {
-    let txCalc = ((numberOfTokens * 4000) + settings.txFee).toFixed(6);
+    let txCalc = (numberOfTokens * 4000 + settings.txFee).toFixed(6);
     if (Number(txCalc) >= Number(settings.txFee)) return Number(txCalc);
     return Number(settings.txFee);
   };

diff --git a/client/src/components/Header/index.tsx b/client/src/components/Header/index.tsx
@@ -19,7 +19,7 @@ function Header() {
   const theme = useSelector((state: RootState) => state.global.theme);
   const chain = useSelector((state: RootState) => state.global.chain);
   const connectedWallet = useSelector(
-    (state: RootState) => state.wallet.walletApi
+    (state: RootState) => state.wallet.walletApi,
   );
 
   const RenderWalletConnector = useCallback(() => {

diff --git a/client/src/components/Menu/cardano.tsx b/client/src/components/Menu/cardano.tsx
@@ -139,7 +139,7 @@ export default function MenuCardano() {
                     key={socialMediaItem.url}
                     socialMediaItem={socialMediaItem}
                   />
-                )
+                ),
               )}
             </div>
           </div>

diff --git a/client/src/components/Menu/ergo.tsx b/client/src/components/Menu/ergo.tsx
@@ -136,7 +136,7 @@ export default function MenuErgo() {
                     key={socialMediaItem.url}
                     socialMediaItem={socialMediaItem}
                   />
-                )
+                ),
               )}
             </div>
           </div>

diff --git a/client/src/components/MobileMenu/cardano.tsx b/client/src/components/MobileMenu/cardano.tsx
@@ -124,7 +124,7 @@ export default function MobileMenuCardano() {
                 key={socialMediaItem.url}
                 socialMediaItem={socialMediaItem}
               />
-            )
+            ),
           )}
         </div>
       </div>

diff --git a/client/src/components/MobileMenu/ergo.tsx b/client/src/components/MobileMenu/ergo.tsx
@@ -124,7 +124,7 @@ export default function MobileMenuErgo() {
                 key={socialMediaItem.url}
                 socialMediaItem={socialMediaItem}
               />
-            )
+            ),
           )}
         </div>
       </div>

diff --git a/client/src/components/Modal/InfoModal.tsx b/client/src/components/Modal/InfoModal.tsx
@@ -12,7 +12,7 @@ import { InfoModalTypes } from "src/entities/common.entities";
 export const InfoModal = () => {
   const dispatch = useDispatch();
   const { text, type } = useSelector(
-    (state: RootState) => state.global.infoModalDetails
+    (state: RootState) => state.global.infoModalDetails,
   );
 
   const renderIcon = () => {

diff --git a/client/src/components/WalletSelector/CardanoWalletSelector.tsx b/client/src/components/WalletSelector/CardanoWalletSelector.tsx
@@ -13,7 +13,7 @@ function CardanoWalletSelector() {
     dispatch(
       showModal({
         modalType: ModalTypes.wallet,
-      })
+      }),
     );
   };
 

diff --git a/client/src/components/WalletSelector/Disconnect.tsx b/client/src/components/WalletSelector/Disconnect.tsx
@@ -22,7 +22,7 @@ const Disconnect = forwardRef<HTMLDivElement, Props>(
         Disconnect
       </div>
     );
-  }
+  },
 );
 
 export default Disconnect;
diff --git a/client/src/components/WalletSelector/ErgoWalletSelector.tsx b/client/src/components/WalletSelector/ErgoWalletSelector.tsx
@@ -15,7 +15,7 @@ import WalletSelector from "./WalletSelector";
 export default function ErgoWalletSelector() {
   const dispatch = useDispatch();
   const connectedWallet = useSelector(
-    (state: RootState) => state.wallet.ergoWalletApi
+    (state: RootState) => state.wallet.ergoWalletApi,
   );
   const { connectWallet, disconnectWallet } = useErgoWallet();
   const walletInfoNotConnected = {
@@ -24,10 +24,10 @@ export default function ErgoWalletSelector() {
     isApiConnected: false,
   };
   const [walletInfo, setWalletInfo] = useState<WalletInfo>(
-    walletInfoNotConnected
+    walletInfoNotConnected,
   );
   const [walletState, setWalletState] = useState<WalletState>(
-    WalletState.notConnected
+    WalletState.notConnected,
   );
 
   useEffect(() => {
@@ -52,7 +52,7 @@ export default function ErgoWalletSelector() {
     dispatch(
       showModal({
         modalType: ModalTypes.ergoWallet,
-      })
+      }),
     );
   };
 

diff --git a/client/src/components/WalletSelector/WalletSelector.tsx b/client/src/components/WalletSelector/WalletSelector.tsx
@@ -15,7 +15,7 @@ interface Props {
 
 function WalletSelector({ disconnectWallet, showWalletSelection }: Props) {
   const walletState = useSelector(
-    (state: RootState) => state.wallet.walletState
+    (state: RootState) => state.wallet.walletState,
   );
 
   switch (walletState) {

diff --git a/client/src/entities/dto.ts b/client/src/entities/dto.ts
@@ -94,7 +94,7 @@ export namespace Dto {
   export interface GetMinswapPriceInfoMap extends Base {
     response: MinswapTypes.PriceInfoMap;
   }
-  
+
   export interface PostBannerText extends Base {
     body: {
       text: string;

diff --git a/client/src/hooks/cardano/claim/useClaimReward.tsx b/client/src/hooks/cardano/claim/useClaimReward.tsx
@@ -16,10 +16,10 @@ export default function useClaimReward() {
   const { handleError } = useErrorHandler();
   const { showInfoModal } = useModal();
   const connectedWalletAddress = useSelector(
-    (state: RootState) => state.wallet.walletAddress
+    (state: RootState) => state.wallet.walletAddress,
   );
   const isWrongNetwork = useSelector(
-    (state: RootState) => state.wallet.isWrongNetwork
+    (state: RootState) => state.wallet.isWrongNetwork,
   );
 
   const [searchAddress, setSearchAddress] = useState("");
@@ -43,7 +43,7 @@ export default function useClaimReward() {
           agg += 1;
         }
         return agg;
-      }, 0)
+      }, 0),
     );
   }, [claimableTokens]);
 
@@ -56,7 +56,7 @@ export default function useClaimReward() {
     ) {
       showInfoModal(
         `You have selected the maximum number of tokens to claim (${maxTokenSelected}).
-         Please deselect other tokens first`
+         Please deselect other tokens first`,
       );
       return;
     }
@@ -86,7 +86,7 @@ export default function useClaimReward() {
     const updatedClaimableTokens = [...claimableTokens];
     updatedClaimableTokens.forEach((token) => (token.selected = false));
     positions.forEach(
-      (position) => (updatedClaimableTokens[position].selected = true)
+      (position) => (updatedClaimableTokens[position].selected = true),
     );
 
     setClaimableTokens(updatedClaimableTokens);
@@ -133,7 +133,7 @@ export default function useClaimReward() {
             } else {
               return a.premium ? -1 : 1;
             }
-          })
+          }),
       );
       setPoolInfo(getRewardsResponse.pool_info);
       setIsCheckRewardLoading(false);
@@ -165,7 +165,7 @@ export default function useClaimReward() {
         stakeAddress,
         stakeAddress.slice(0, 40),
         selectedTokenId.join(","),
-        selectedPremiumToken
+        selectedPremiumToken,
       );
       if (res == null) throw new Error();
 

diff --git a/client/src/hooks/cardano/claimHistory/useClaimHistory.tsx b/client/src/hooks/cardano/claimHistory/useClaimHistory.tsx
@@ -39,7 +39,7 @@ export default function useClaimHistory() {
               text: "No claim history found for the account, yet.",
               type: InfoModalTypes.info,
             },
-          })
+          }),
         );
       }
     } catch (e: unknown) {

diff --git a/client/src/hooks/cardano/useStakeToPool.tsx b/client/src/hooks/cardano/useStakeToPool.tsx
@@ -8,10 +8,10 @@ export default function useStakeToPool() {
   const [loading, setLoading] = useState(false);
   const { handleError } = useErrorHandler();
   const connectedWalletApi = useSelector(
-    (state: RootState) => state.wallet.walletApi
+    (state: RootState) => state.wallet.walletApi,
   );
   const connectedWalletAddress = useSelector(
-    (state: RootState) => state.wallet.walletAddress
+    (state: RootState) => state.wallet.walletAddress,
   );
 
   async function stakeToPool(poolId: string, callback?: () => void) {

diff --git a/client/src/hooks/cardano/useTransfer.tsx b/client/src/hooks/cardano/useTransfer.tsx
@@ -8,15 +8,15 @@ export default function useTransfer() {
   const [loading, setLoading] = useState(false);
   const { handleError } = useErrorHandler();
   const connectedWalletApi = useSelector(
-    (state: RootState) => state.wallet.walletApi
+    (state: RootState) => state.wallet.walletApi,
   );
   const connectedWalletAddress = useSelector(
-    (state: RootState) => state.wallet.walletAddress
+    (state: RootState) => state.wallet.walletAddress,
   );
 
   async function transfer(
     { toAddress, amountToSend }: { toAddress: string; amountToSend: string },
-    callback?: (txId?: string) => void
+    callback?: (txId?: string) => void,
   ) {
     setLoading(true);
     try {

diff --git a/client/src/hooks/ergo/useErgoWallet.tsx b/client/src/hooks/ergo/useErgoWallet.tsx
@@ -36,7 +36,7 @@ export default function useErgoWallet() {
   };
 
   const connectNautilus = async (
-    ergoConnector: ErgoConnector
+    ergoConnector: ErgoConnector,
   ): Promise<NautilusErgoWalletApi> => {
     const nautilus = ergoConnector.nautilus;
     if (nautilus == null)

diff --git a/client/src/hooks/useClickOutside.tsx b/client/src/hooks/useClickOutside.tsx
@@ -10,7 +10,7 @@ const useClickOutside = (action: Function) => {
         action();
       }
     },
-    [action]
+    [action],
   );
 
   useEffect(() => {

diff --git a/client/src/hooks/useErrorHandler.tsx b/client/src/hooks/useErrorHandler.tsx
@@ -35,7 +35,7 @@ const useErrorHandler = () => {
           text,
           type: InfoModalTypes.failure,
         },
-      })
+      }),
     );
   };
 

diff --git a/client/src/hooks/useModal.tsx b/client/src/hooks/useModal.tsx
@@ -13,7 +13,7 @@ export default function useModal() {
           text: text,
           type: InfoModalTypes.info,
         },
-      })
+      }),
     );
   };
 
@@ -25,7 +25,7 @@ export default function useModal() {
           text: text,
           type: InfoModalTypes.failure,
         },
-      })
+      }),
     );
   };
 
@@ -37,7 +37,7 @@ export default function useModal() {
           text: text,
           type: InfoModalTypes.success,
         },
-      })
+      }),
     );
   };
 

diff --git a/client/src/hooks/useWallet.tsx b/client/src/hooks/useWallet.tsx
@@ -46,7 +46,7 @@ const useWallet = () => {
         wallet: connectedWallet,
         walletApi: connectedWalletApi,
         walletAddress: addressInBech32,
-      })
+      }),
     );
     localStorage.setItem("wallet-provider", walletKey);
 
@@ -60,7 +60,7 @@ const useWallet = () => {
   };
 
   const getWalletAddressInBech32 = async (
-    walletApi: WalletApi
+    walletApi: WalletApi,
   ): Promise<string> => {
     if (walletApi == null) {
       return "";

diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -15,7 +15,7 @@ ReactDOM.render(
       </Provider>
     </BrowserRouter>
   </React.StrictMode>,
-  document.getElementById("root")
+  document.getElementById("root"),
 );
 
 // If you want to start measuring performance in your app, pass a function

diff --git a/client/src/layouts/RouterWrapper/index.tsx b/client/src/layouts/RouterWrapper/index.tsx
@@ -9,7 +9,7 @@ import { RootState } from "src/store";
 
 export default function RouterWrapper() {
   const ergoEnabled = useSelector(
-    (state: RootState) => state.global.ergoEnabled
+    (state: RootState) => state.global.ergoEnabled,
   );
   return (
     <Routes>

diff --git a/client/src/pages/Cardano/ClaimHistory/index.tsx b/client/src/pages/Cardano/ClaimHistory/index.tsx
@@ -7,10 +7,10 @@ import { RootState } from "src/store";
 
 function ClaimHistory() {
   const connectedWalletAddress = useSelector(
-    (state: RootState) => state.wallet.walletAddress
+    (state: RootState) => state.wallet.walletAddress,
   );
   const isWrongNetwork = useSelector(
-    (state: RootState) => state.wallet.isWrongNetwork
+    (state: RootState) => state.wallet.isWrongNetwork,
   );
   const { claimHistory, loading, checkClaimHistory } = useClaimHistory();
   const [searchAddress, setSearchAddress] = useState<string>("");

diff --git a/client/src/pages/Cardano/Deposit/index.tsx b/client/src/pages/Cardano/Deposit/index.tsx
@@ -70,7 +70,7 @@ const DepositInfoPage = () => {
        */
       const txStatus: TransactionStatus = await getTxStatus(
         requestId,
-        stakeAddress.slice(0, 40)
+        stakeAddress.slice(0, 40),
       );
 
       /**

diff --git a/client/src/reducers/globalSlice.ts b/client/src/reducers/globalSlice.ts
@@ -58,7 +58,7 @@ export const globalSlice = createSlice({
       action: PayloadAction<{
         modalType: ModalTypes;
         details?: InfoModalDetails;
-      }>
+      }>,
     ) => {
       const { modalType, details } = action.payload;
       switch (modalType) {