re-enable and fix mobile details dialog

taikoxyz · May 7, 2024 · 9bdd698 · 9bdd698
1 parent 2677708
commit 9bdd698
Show file tree

Hide file tree

Showing 5 changed files with 9,387 additions and 7,335 deletions.
diff --git a/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte b/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte
@@ -56,9 +56,9 @@
   let canonicalAddress: Address | null;
   let canonicalChain: number | null;
 
-  $: if (token && !fetchingAddress && !canonicalAddress && !bridgedAddress) {
-    fetchTokenAddresses();
-  }
+  const forwardEvent = (e: CustomEvent) => {
+    dispatch(e.type, e.detail);
+  };
 
   const fetchTokenAddresses = async () => {
     if (!token) return;
@@ -86,6 +86,9 @@
     fetchingAddress = false;
   };
 
+  $: if (token && !fetchingAddress && !canonicalAddress && !bridgedAddress) {
+    fetchTokenAddresses();
+  }
   $: imageUrl = token?.metadata?.image || placeholderUrl;
 
   $: isERC721 = selectedItem?.tokenType === TokenType.ERC721;
@@ -128,7 +131,11 @@
               </div>
             </h4>
             <div class="f-items-center space-x-1">
-              <Status bridgeTx={selectedItem} on:insufficientFunds={handleInsufficientFunds} />
+              <Status
+                bridgeTxStatus={selectedItem.status}
+                bridgeTx={selectedItem}
+                on:openModal={forwardEvent}
+                on:insufficientFunds={handleInsufficientFunds} />
             </div>
           </li>
 

diff --git a/packages/bridge-ui/src/components/Transactions/Status/Status.svelte b/packages/bridge-ui/src/components/Transactions/Status/Status.svelte
@@ -1,45 +1,33 @@
 <script lang="ts">
-  import { onDestroy, onMount } from 'svelte';
+  import { createEventDispatcher, onDestroy, onMount } from 'svelte';
   import { t } from 'svelte-i18n';
 
-  import { ClaimDialog, ReleaseDialog, RetryDialog } from '$components/Dialogs';
   import { Spinner } from '$components/Spinner';
   import { StatusDot } from '$components/StatusDot';
   import { type BridgeTransaction, MessageStatus } from '$libs/bridge';
-  import { getMessageStatusForMsgHash } from '$libs/bridge/getMessageStatusForMsgHash';
   import { isTransactionProcessable } from '$libs/bridge/isTransactionProcessable';
   import { BridgePausedError } from '$libs/error';
   import { PollingEvent, startPolling } from '$libs/polling/messageStatusPoller';
-  import type { NFT } from '$libs/token';
   import { isBridgePaused } from '$libs/util/checkForPausedContracts';
   import { account } from '$stores/account';
   import { connectedSourceChain } from '$stores/network';
 
+  const dispatch = createEventDispatcher();
+
   export let bridgeTx: BridgeTransaction;
-  export let nft: NFT | null = null;
 
   let polling: ReturnType<typeof startPolling>;
 
   // UI state
   let isProcessable = false; // bridge tx state to be processed: claimed/retried/released
-  let bridgeTxStatus: Maybe<MessageStatus>;
+  export let bridgeTxStatus: Maybe<MessageStatus>;
 
   let loading = false;
 
   function onProcessable(isTxProcessable: boolean) {
     isProcessable = isTxProcessable;
   }
 
-  async function claimingDone() {
-    // Keeping model and UI in sync
-    bridgeTx.msgStatus = await getMessageStatusForMsgHash({
-      msgHash: bridgeTx.msgHash,
-      srcChainId: Number(bridgeTx.srcChainId),
-      destChainId: Number(bridgeTx.destChainId),
-    });
-    bridgeTxStatus = bridgeTx.msgStatus;
-  }
-
   function onStatusChange(status: MessageStatus) {
     // Keeping model and UI in sync
     bridgeTxStatus = bridgeTx.msgStatus = status;
@@ -50,15 +38,17 @@
       if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$connectedSourceChain || !$account?.address) return;
-    retryModalOpen = true;
+    // retryModalOpen = true;
+    dispatch('openModal', 'retry');
   }
 
   async function handleReleaseClick() {
     isBridgePaused().then((paused) => {
       if (paused) throw new BridgePausedError('Bridge is paused');
     });
     if (!$connectedSourceChain || !$account?.address) return;
-    releaseModalOpen = true;
+    // releaseModalOpen = true;
+    dispatch('openModal', 'release');
   }
 
   async function handleClaimClick() {
@@ -67,7 +57,8 @@
     });
     if (!$connectedSourceChain || !$account?.address) return;
 
-    claimModalOpen = true;
+    // claimModalOpen = true;
+    dispatch('openModal', 'claim');
   }
 
   async function release() {
@@ -78,10 +69,6 @@
     // TODO: implement release handling
   }
 
-  $: claimModalOpen = false;
-  $: retryModalOpen = false;
-  $: releaseModalOpen = false;
-
   onMount(async () => {
     if (bridgeTx && $account?.address) {
       bridgeTxStatus = bridgeTx.msgStatus;
@@ -143,9 +130,3 @@
     <span>{$t('transactions.status.error.name')}</span>
   {/if}
 </div>
-
-<RetryDialog {bridgeTx} bind:dialogOpen={retryModalOpen} />
-
-<ReleaseDialog {bridgeTx} bind:dialogOpen={releaseModalOpen} />
-
-<ClaimDialog {bridgeTx} bind:loading bind:dialogOpen={claimModalOpen} {nft} on:claimingDone={() => claimingDone()} />
diff --git a/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte b/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte
@@ -70,9 +70,8 @@
       <h4 class={classes.headline}>{$t('transactions.status.failed.name')}</h4>
       {$t('transactions.status.failed.description')}
     </div>
-
-    <!-- We catch key events aboe -->
-    <!-- svelte-ignore a11y-click-events-have-key-events -->
-    <div role="button" tabindex="0" class="overlay-backdrop" on:click={closeModalIfClickedOutside} />
   </div>
+  <!-- We catch key events aboe -->
+  <!-- svelte-ignore a11y-click-events-have-key-events -->
+  <div role="button" tabindex="0" class="overlay-backdrop" on:click={closeModalIfClickedOutside} />
 </dialog>
diff --git a/packages/bridge-ui/src/components/Transactions/Transaction.svelte b/packages/bridge-ui/src/components/Transactions/Transaction.svelte
@@ -4,11 +4,13 @@
 
   import { chainConfig } from '$chainConfig';
   import { DesktopOrLarger } from '$components/DesktopOrLarger';
+  import { ClaimDialog, ReleaseDialog, RetryDialog } from '$components/Dialogs';
   import { Icon } from '$components/Icon';
   import { LoadingText } from '$components/LoadingText';
   import NftInfoDialog from '$components/NFTs/NFTInfoDialog.svelte';
   import Spinner from '$components/Spinner/Spinner.svelte';
-  import type { BridgeTransaction } from '$libs/bridge';
+  import { type BridgeTransaction, MessageStatus } from '$libs/bridge';
+  import { getMessageStatusForMsgHash } from '$libs/bridge/getMessageStatusForMsgHash';
   import { getChainName } from '$libs/chain';
   import { type NFT, TokenType } from '$libs/token';
   import { fetchNFTImageUrl } from '$libs/token/fetchNFTImageUrl';
@@ -17,6 +19,7 @@
 
   import ChainSymbolName from './ChainSymbolName.svelte';
   import InsufficientFunds from './InsufficientFunds.svelte';
+  import MobileDetailsDialog from './MobileDetailsDialog.svelte';
   import { Status } from './Status';
 
   export let item: BridgeTransaction;
@@ -26,6 +29,9 @@
   let insufficientModal = false;
   let nftInfoOpen = false;
   let isDesktopOrLarger = false;
+  let detailsOpen = false;
+
+  let bridgeTxStatus: Maybe<MessageStatus>;
 
   let attrs = isDesktopOrLarger ? {} : { role: 'button' };
 
@@ -35,10 +41,30 @@
     nftInfoOpen = true;
   };
 
+  const openDetails = () => {
+    if (!isDesktopOrLarger && !interactiveDialogsOpen) {
+      detailsOpen = true;
+    }
+  };
+
+  const closeDetails = () => {
+    detailsOpen = false;
+  };
+
   const handleInsufficientFunds = () => {
     insufficientModal = true;
   };
 
+  const handleOpenModal = (event: CustomEvent) => {
+    if (event.detail === 'retry') {
+      retryModalOpen = true;
+    } else if (event.detail === 'release') {
+      releaseModalOpen = true;
+    } else if (event.detail === 'claim') {
+      claimModalOpen = true;
+    }
+  };
+
   async function analyzeTransactionInput(): Promise<void> {
     loading = true;
     try {
@@ -54,6 +80,16 @@
     loading = false;
   }
 
+  async function claimingDone() {
+    // Keeping model and UI in sync
+    item.msgStatus = await getMessageStatusForMsgHash({
+      msgHash: item.msgHash,
+      srcChainId: Number(item.srcChainId),
+      destChainId: Number(item.destChainId),
+    });
+    bridgeTxStatus = item.msgStatus;
+  }
+
   $: {
     if (item.tokenType === TokenType.ERC721 || item.tokenType === TokenType.ERC1155) {
       // for NFTs we need to fetch more information about the transaction
@@ -66,6 +102,12 @@
   $: itemAmountDisplay = item.tokenType === TokenType.ERC721 ? '---' : item.amount;
 
   $: isNFT = [TokenType.ERC1155, TokenType.ERC721].includes(item.tokenType);
+
+  $: claimModalOpen = false;
+  $: retryModalOpen = false;
+  $: releaseModalOpen = false;
+
+  $: interactiveDialogsOpen = claimModalOpen || retryModalOpen || releaseModalOpen;
 </script>
 
 {#if isNFT}
@@ -108,7 +150,8 @@
         {itemAmountDisplay}
       </div>
     {:else}
-      <div class="flex text-primary-content w-full justify-content-left">
+      <!-- svelte-ignore a11y-no-static-element-interactions -->
+      <div on:click={openDetails} {...attrs} class="flex text-primary-content w-full justify-content-left">
         {#if loading}
           <div class="rounded-[10px] w-[50px] h-[50px] bg-neutral flex items-center justify-center">
             <Spinner />
@@ -128,7 +171,7 @@
             <LoadingText mask="&nbsp;" class="min-w-[50px] max-w-[50px] h-3" />
           </div>
         {:else}
-          <div class="f-col" {...attrs} tabindex="0">
+          <div class="f-col" tabindex="0">
             <div class="f-row font-bold">
               {truncateString(getChainName(Number(item.srcChainId)), 8)}
               <i role="img" aria-label="arrow to" class="mx-auto px-2">
@@ -142,7 +185,11 @@
       </div>
     {/if}
     <div class="flex md:w-2/12 py-2 flex flex-col justify-center text-center" {...attrs} tabindex="0">
-      <Status bridgeTx={item} nft={token} on:insufficientFunds={handleInsufficientFunds} />
+      <Status
+        bridgeTx={item}
+        bind:bridgeTxStatus
+        on:openModal={handleOpenModal}
+        on:insufficientFunds={handleInsufficientFunds} />
     </div>
     <div class="hidden md:flex grow py-2 flex flex-col justify-center">
       <a
@@ -155,7 +202,11 @@
     </div>
   </div>
 {:else}
-  <div {...attrs} class="flex text-primary-content md:h-[80px] h-[45px] w-full my-[10px] md:my-[0px]">
+  <!-- svelte-ignore a11y-no-static-element-interactions -->
+  <div
+    on:click={openDetails}
+    {...attrs}
+    class="flex text-primary-content md:h-[80px] h-[45px] w-full my-[10px] md:my-[0px]">
     {#if isDesktopOrLarger}
       <div class="w-1/5 py-2 flex flex-row">
         <ChainSymbolName chainId={item.srcChainId} />
@@ -194,7 +245,11 @@
     {/if}
 
     <div class="md:w-1/5 py-2 flex flex-col justify-center">
-      <Status bridgeTx={item} on:insufficientFunds={handleInsufficientFunds} />
+      <Status
+        bridgeTx={item}
+        bind:bridgeTxStatus
+        on:openModal={handleOpenModal}
+        on:insufficientFunds={handleInsufficientFunds} />
     </div>
     <div class="hidden md:flex w-1/5 py-2 flex flex-col justify-center">
       <a
@@ -213,3 +268,22 @@
 <NftInfoDialog nft={token} bind:modalOpen={nftInfoOpen} viewOnly />
 
 <InsufficientFunds bind:modalOpen={insufficientModal} />
+
+<MobileDetailsDialog
+  {token}
+  {closeDetails}
+  {detailsOpen}
+  selectedItem={item}
+  on:insufficientFunds={handleInsufficientFunds}
+  on:openModal={handleOpenModal} />
+
+<RetryDialog bridgeTx={item} bind:dialogOpen={retryModalOpen} />
+
+<ReleaseDialog bridgeTx={item} bind:dialogOpen={releaseModalOpen} />
+
+<ClaimDialog
+  bridgeTx={item}
+  bind:loading
+  bind:dialogOpen={claimModalOpen}
+  nft={token}
+  on:claimingDone={() => claimingDone()} />