Merge pull request #159 from map3xyz/fix/theme

fix(theme): light bg is transparent
map3xyz · Mar 13, 2023 · aea61f2 · aea61f2
2 parents 738677c + d7ed7c9
commit aea61f2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -56,7 +56,7 @@ const Layout = ({
   return (
     <motion.div
       animate={{ opacity: 1, scale: 1 }}
-      className={`map3 absolute overflow-hidden rounded-md border dark:border-primary-700 dark:bg-primary-900`}
+      className={`map3 absolute overflow-hidden rounded-md border bg-white dark:border-primary-700 dark:bg-primary-900`}
       exit={{ opacity: 0 }}
       initial={{ opacity: 0, scale: 0.5 }}
       style={{

diff --git a/src/hooks/useWatchedAddressProgress.tsx b/src/hooks/useWatchedAddressProgress.tsx
@@ -9,6 +9,20 @@ export const useWatchedAddressProgress = () => {
 
   const [removeWatchedAddress] = useRemoveWatchedAddressMutation();
 
+  const handleConfirmed = (address: string) => {
+    dispatch({
+      payload: {
+        data: '🚀 Transaction confirmed!',
+        status: 'success',
+        step: 'Confirmed',
+      },
+      type: 'SET_TX',
+    });
+    removeWatchedAddress({
+      variables: { watchedAddressId: address },
+    });
+  };
+
   const run = async (
     payload: WatchAddressPayload,
     address: string,
@@ -55,6 +69,10 @@ export const useWatchedAddressProgress = () => {
         const requiredBlock = payload.new.tx_block_height + MIN_CONFIRMATIONS;
         const remainingBlocks = Math.max(0, requiredBlock - currentBlock);
         const remainingBlocksText = remainingBlocks === 1 ? 'block' : 'blocks';
+        if (remainingBlocks === 0) {
+          handleConfirmed(address);
+          return;
+        }
         dispatch({
           payload: {
             data: `Current block height: ${currentBlock}. ${remainingBlocks} more ${remainingBlocksText} required for confirmation.`,
@@ -65,17 +83,7 @@ export const useWatchedAddressProgress = () => {
         });
         break;
       case 'confirmed':
-        dispatch({
-          payload: {
-            data: '🚀 Transaction confirmed!',
-            status: 'success',
-            step: 'Confirmed',
-          },
-          type: 'SET_TX',
-        });
-        removeWatchedAddress({
-          variables: { watchedAddressId: address },
-        });
+        handleConfirmed(address);
         break;
     }
   };

diff --git a/src/preview.tsx b/src/preview.tsx
@@ -28,7 +28,9 @@ root.render(
               },
             },
             style: {
-              theme: 'dark',
+              embed: {
+                id: 'supercharge',
+              },
             },
           },
           userId: 'preview-user-id',