Merge pull request #36 from syscoin/admin-panel

Admin panel
syscoin · Dec 11, 2023 · 0e9e4cd · 0e9e4cd · vercel · Dec 11, 2023
2 parents 4aa764a + c0cd1bc
commit 0e9e4cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/components/Bridge/WalletSwitchV2/UTXOConnect.tsx b/components/Bridge/WalletSwitchV2/UTXOConnect.tsx
@@ -67,7 +67,13 @@ const UTXOConnect: React.FC<UTXOConnectProps> = ({
     }
     const emptySysxBalance =
       sysxBalance.data === undefined || sysxBalance.data === 0;
-    if ((sysxBalance.isError || emptySysxBalance) && setSelectedAsset) {
+
+    const sysxIsInvalid = sysxBalance.isError || emptySysxBalance;
+
+    if (
+      (sysxIsInvalid || transfer.type === "nevm-to-sys") &&
+      setSelectedAsset
+    ) {
       setSelectedAsset("sys");
     }
   }, [
@@ -76,6 +82,7 @@ const UTXOConnect: React.FC<UTXOConnectProps> = ({
     sysxBalance.data,
     sysxBalance.isFetched,
     transfer.utxoAddress,
+    transfer.type,
     isBitcoinBased,
   ]);
 

diff --git a/pages/bridge/v3/[id].tsx b/pages/bridge/v3/[id].tsx
@@ -2,7 +2,11 @@ import NEVMProvider from "@contexts/ConnectedWallet/NEVMProvider";
 import ConnectedWalletProvider from "@contexts/ConnectedWallet/Provider";
 import MetamaskProvider from "@contexts/Metamask/Provider";
 import { PaliWalletV2Provider } from "@contexts/PaliWallet/V2Provider";
-import { COMMON_STATUS, ITransfer, TransferType } from "@contexts/Transfer/types";
+import {
+  COMMON_STATUS,
+  ITransfer,
+  TransferType,
+} from "@contexts/Transfer/types";
 import {
   Box,
   Button,
@@ -49,7 +53,7 @@ const createTransfer = (type: TransferType): ITransfer => ({
   logs: [],
   createdAt: Date.now(),
   version: "v2",
-  agreedToTerms: false
+  agreedToTerms: false,
 });
 
 const BridgeV3Page: NextPage = () => {
@@ -75,7 +79,7 @@ const BridgeV3Page: NextPage = () => {
               <NEVMProvider>
                 <ConnectedWalletProvider>
                   <TransferContextProvider transfer={initialTransfer}>
-                    <Container sx={{ mt: 10 }}>
+                    <Container sx={{ mt: 10, mb: 15 }}>
                       <BlocktimeDisclaimer />
                       <Typography variant="h5" fontWeight="bold">
                         Bridge Your SYS