Squashed commit of the following:

commit 99aa5a0 Author: 0xhwk <[email protected]> Date: Wed Nov 22 16:12:44 2023 +0300 docs(website): changed chainlist link to list taiko chains and testnets (#15212) Co-authored-by: dave <[email protected]> commit d634f16 Author: TABASCO <[email protected]> Date: Wed Nov 22 06:12:05 2023 -0700 chore(website): Adds Particle Taiko Onboarding to learning-resources (#15032) commit 989cd2a Author: Szymon Wolny <[email protected]> Date: Wed Nov 22 10:19:06 2023 +0100 docs(website): update reference docs (#15018) Co-authored-by: Roger <[email protected]> commit a088b3e Author: Suresh <[email protected]> Date: Wed Nov 22 11:15:09 2023 +0700 Update prover-market-page.mdx (#15239) commit e07ed4d Author: Bennett Yong <[email protected]> Date: Tue Nov 21 22:36:43 2023 +0800 refactor: prover market page (#15237) commit 462149c Author: ptchela <[email protected]> Date: Thu Nov 16 18:14:29 2023 +0100 refactor(bridge-ui-v2): Optimize bridge config generation logic (#15194) commit ddc8447 Author: CodeDragonVN <[email protected]> Date: Mon Nov 13 07:55:01 2023 +0000 docs(website,protocol): Correct Documentation Descriptions in ICrossChainSync and IProver (#15189) Co-authored-by: dave <[email protected]> commit 4a7c925 Author: Kenk <[email protected]> Date: Mon Nov 13 08:14:18 2023 +0300 feat(website): update prover endpoints (#15195) commit f9ab9f0 Author: Olga Skraglenko <[email protected]> Date: Sun Nov 12 21:07:34 2023 +0100 docs(website): Update prover-market-page.mdx (#15175) Co-authored-by: dave <[email protected]> commit f5304b2 Author: zEustace <[email protected]> Date: Sun Nov 12 16:55:56 2023 -0300 docs(website): Update run-a-sepolia-node.mdx (#15160) Co-authored-by: dave <[email protected]> commit 05a9f46 Author: 0xoats <[email protected]> Date: Mon Nov 13 03:06:03 2023 +0800 docs(website): update prover-market-page (#15163) Co-authored-by: dave <[email protected]> commit 96abcf1 Author: acebryant08 <[email protected]> Date: Mon Nov 13 03:04:48 2023 +0800 docs(website): Update prover-market-page.mdx (#15193) commit a104926 Author: MariesAmbrosio <[email protected]> Date: Sun Nov 12 14:08:17 2023 +0800 docs(website): Update prover-market-page.mdx (#15178) commit e9b82ea Author: Korbinian <[email protected]> Date: Sun Nov 12 04:01:40 2023 +0300 fix(bridge-ui-v2): processing fee and recipient not sticking (#15125) Co-authored-by: Daniel Wang <[email protected]> commit a0b3cbe Author: Ohmarkely <[email protected]> Date: Sat Nov 11 01:18:23 2023 +0800 docs(website): Update prover-market-page.mdx (#15150) Co-authored-by: Roger <[email protected]> commit f561a8c Author: Canarias96 <[email protected]> Date: Fri Nov 10 12:37:51 2023 +0000 chore(website): Update prover-market-page.mdx (#15171) Co-authored-by: dave <[email protected]> Co-authored-by: Roger <[email protected]> commit b05279c Author: VadimSMG <[email protected]> Date: Fri Nov 10 14:09:27 2023 +0200 docs(website): Update prover-market-page.mdx (#15168) Co-authored-by: dave <[email protected]> Co-authored-by: David <[email protected]> commit 7b994dd Author: Shao Ming Xing <[email protected]> Date: Fri Nov 10 20:08:58 2023 +0800 docs(protocol): fix some typos (#15174) Co-authored-by: shaomingxing <[email protected]> commit f6b6f5f Author: Mickaël Schoentgen <[email protected]> Date: Fri Nov 10 08:51:26 2023 +0100 fix(website): Link to the Taiko Swap v3 (#15138) commit 926ac5c Author: zEustace <[email protected]> Date: Thu Nov 9 12:47:30 2023 -0300 Update prover-market-page.mdx (#15156) commit 4c5c1b9 Author: SamiAlHassan <[email protected]> Date: Thu Nov 9 15:44:10 2023 +0000 fix(docs): Documentation Corrections for Bridge Contract and Integration Manual (#15144) commit 361e98b Author: shak58 <[email protected]> Date: Thu Nov 9 03:55:42 2023 +0000 Fix typos in RLP decoding and transaction splitting documentation (#15141) Co-authored-by: Roger <[email protected]> commit a062249 Author: Dedok1 <[email protected]> Date: Thu Nov 9 06:51:46 2023 +0300 Update prover-market-page.mdx (#15149) commit b91cc1a Author: iwantanode <[email protected]> Date: Tue Nov 7 18:53:04 2023 +0200 fix(README.md): minor typos (#15139) Co-authored-by: Roger <[email protected]> commit 201384f Author: Crytobike <[email protected]> Date: Wed Nov 8 00:37:11 2023 +0800 Update prover-market-page.mdx (#15118) Co-authored-by: Roger <[email protected]> commit 071ba20 Author: Ivan Pospelov <[email protected]> Date: Tue Nov 7 19:31:39 2023 +0300 Update prover-market-page.mdx (#15142) Co-authored-by: Roger <[email protected]> commit f1a4701 Author: oktay Aslan <[email protected]> Date: Tue Nov 7 19:29:10 2023 +0300 Update prover-market-page.mdx (#15121) Co-authored-by: Roger <[email protected]> commit 0e1d223 Author: mahamb <[email protected]> Date: Wed Nov 8 00:24:23 2023 +0800 Update prover-market-page.mdx (#15137) Co-authored-by: Roger <[email protected]> commit b4f1121 Author: 0xBaka <[email protected]> Date: Tue Nov 7 17:20:04 2023 +0100 docs(website): Update prover-market-page.mdx (#15135) Co-authored-by: Roger <[email protected]> commit 9da9e39 Author: Arthas <[email protected]> Date: Tue Nov 7 16:16:20 2023 +0000 docs(website): Update prover-market-page.mdx (#15140) commit e144b75 Author: MartinKong1990 <[email protected]> Date: Mon Nov 6 23:19:21 2023 +0800 feat(website): Fix Broken Link for Meta Merge in EcosystemSection.tsx (#15126)
taikoxyz · Nov 22, 2023 · a722387 · a722387
1 parent 66f1ad2
commit a722387
Show file tree

Hide file tree

Showing 38 changed files with 219 additions and 240 deletions.
diff --git a/packages/bridge-ui-v2/scripts/vite-plugins/generateBridgeConfig.ts b/packages/bridge-ui-v2/scripts/vite-plugins/generateBridgeConfig.ts
@@ -62,8 +62,6 @@ export function generateBridgeConfig() {
       await sourceFile.saveSync();
       logger.info(`Generated config file`);
 
-      await sourceFile.saveSync();
-
       const formatted = await formatSourceFile(tsFilePath);
 
       // Write the formatted code back to the file

diff --git a/packages/bridge-ui-v2/src/components/Bridge/Amount.svelte b/packages/bridge-ui-v2/src/components/Bridge/Amount.svelte
@@ -59,6 +59,7 @@
   }
 
   export async function validateAmount(token = $selectedToken, fee = $processingFee) {
+    if (!$network?.id) return;
     $validatingAmount = true; // During validation, we disable all the actions
     $insufficientBalance = false;
     $insufficientAllowance = false;

diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte
@@ -24,7 +24,13 @@
   import RecipientStep from './NFTBridgeSteps/RecipientStep.svelte';
   import ReviewStep from './NFTBridgeSteps/ReviewStep.svelte';
   import type { ProcessingFee } from './ProcessingFee';
-  import { activeBridge, destNetwork as destinationChain, selectedNFTs, selectedToken } from './state';
+  import {
+    activeBridge,
+    destNetwork as destinationChain,
+    recipientAddress,
+    selectedNFTs,
+    selectedToken,
+  } from './state';
   import { NFTSteps } from './types';
 
   let amountComponent: Amount;
@@ -35,6 +41,8 @@
   let contractAddress: Address | string = '';
   let bridgingStatus: 'pending' | 'done' = 'pending';
 
+  let hasEnoughEth: boolean = false;
+
   function onNetworkChange(newNetwork: Network, oldNetwork: Network) {
     updateForm();
     activeStep = NFTSteps.IMPORT;
@@ -89,12 +97,13 @@
     if (amountComponent) amountComponent.clearAmount();
     if (processingFeeComponent) processingFeeComponent.resetProcessingFee();
     if (addressInputComponent) addressInputComponent.clearAddress();
-    if (recipientStepComponent) recipientStepComponent.reset();
 
     // Update balance after bridging
     if (amountComponent) amountComponent.updateBalance();
     if (nftIdInputComponent) nftIdInputComponent.clearIds();
 
+    $recipientAddress = $account?.address || null;
+    // $processingFee = 0n;
     $selectedToken = ETHToken;
     importMethod === null;
     scanned = false;
@@ -202,6 +211,8 @@
   onDestroy(() => {
     resetForm();
   });
+
+  $: activeStep === NFTSteps.IMPORT && resetForm();
 </script>
 
 <div class="f-col">
@@ -228,10 +239,10 @@
           bind:validating={validatingImport} />
         <!-- REVIEW STEP -->
       {:else if activeStep === NFTSteps.REVIEW}
-        <ReviewStep on:editTransactionDetails={handleTransactionDetailsClick} />
+        <ReviewStep on:editTransactionDetails={handleTransactionDetailsClick} bind:hasEnoughEth />
         <!-- RECIPIENT STEP -->
       {:else if activeStep === NFTSteps.RECIPIENT}
-        <RecipientStep bind:this={recipientStepComponent} />
+        <RecipientStep bind:this={recipientStepComponent} bind:hasEnoughEth />
         <!-- CONFIRM STEP -->
       {:else if activeStep === NFTSteps.CONFIRM}
         <ConfirmationStep bind:bridgingStatus />

diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/RecipientStep.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/RecipientStep.svelte
@@ -7,8 +7,8 @@
   export let hasEnoughEth: boolean = false;
 
   export const reset = () => {
-    recipientComponent.clearRecipient();
-    processingFeeComponent.resetProcessingFee();
+    recipientComponent?.clearRecipient();
+    processingFeeComponent?.resetProcessingFee();
   };
 </script>
 

diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte
@@ -14,7 +14,7 @@
 
   let recipientComponent: Recipient;
   let processingFeeComponent: ProcessingFee;
-  let hasEnoughEth: boolean;
+  export let hasEnoughEth: boolean;
 
   const dispatch = createEventDispatcher();
 

diff --git a/packages/bridge-ui-v2/src/components/Icon/Icon.svelte b/packages/bridge-ui-v2/src/components/Icon/Icon.svelte
@@ -153,7 +153,7 @@
       class={fillClass}
       fill-rule="evenodd"
       clip-rule="evenodd"
-      d="M14.0003 0.916748C6.7746 0.916748 0.916992 6.77436 0.916992 14.0001C0.916992 21.2258 6.7746 27.0834 14.0003 27.0834C21.2261 27.0834 27.0837 21.2258 27.0837 14.0001C27.0837 6.77436 21.2261 0.916748 14.0003 0.916748ZM15.0067 9.97444C15.0067 9.41862 14.5562 8.96803 14.0003 8.96803C13.4445 8.96803 12.9939 9.41862 12.9939 9.97444V12.9937H9.97468C9.41886 12.9937 8.96828 13.4443 8.96828 14.0001C8.96828 14.5559 9.41886 15.0065 9.97468 15.0065H12.9939V18.0257C12.9939 18.5815 13.4445 19.0321 14.0003 19.0321C14.5562 19.0321 15.0067 18.5815 15.0067 18.0257V15.0065H18.026C18.5818 15.0065 19.0324 14.5559 19.0324 14.0001C19.0324 13.4443 18.5818 12.9937 18.026 12.9937H15.0067V9.97444Z" />
+      d="m10,1.98C5.57,1.98,1.98,5.57,1.98,10s3.59,8.02,8.02,8.02,8.02-3.59,8.02-8.02S14.43,1.98,10,1.98Zm.62,5.55c0-.34-.28-.62-.62-.62s-.62.28-.62.62v1.85h-1.85c-.34,0-.62.28-.62.62s.28.62.62.62h1.85v1.85c0,.34.28.62.62.62s.62-.28.62-.62v-1.85h1.85c.34,0,.62-.28.62-.62s-.28-.62-.62-.62h-1.85v-1.85Z" />
   {:else if type === 'circle'}
     <circle class={fillClass} cx="10" cy="10" r="6" />
   {:else if type === 'arrow-right'}

diff --git a/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCardGrid.svelte b/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCardGrid.svelte
@@ -40,7 +40,7 @@
         <span class="badge badge-primary badge-outline badge-xs px-[10px] h-[24px] ml-[10px]"
           ><span class="text-xs">{nftsGroup[0].type}</span></span>
       </div>
-      <div class="token-ids mt-[16px] grid gap-4 grid-3">
+      <div class="token-ids mt-[16px] grid gap-4 grid-cols-3">
         {#each nftsGroup as nft}
           {@const collectionAddress = nft.addresses[chainId]}
           {#if collectionAddress === undefined}