From b82bf8fda91e38868d4bdbbc274b90433686dd3f Mon Sep 17 00:00:00 2001 From: Korbinian Date: Sun, 29 Oct 2023 13:33:40 +0100 Subject: [PATCH] pending status fixed, cleanup --- .../src/components/Bridge/Actions.svelte | 4 +- .../src/components/Bridge/NFTBridge.svelte | 101 +----------------- .../NFTBridgeSteps/ConfirmationStep.svelte | 4 +- .../Bridge/NFTBridgeSteps/ReviewStep.svelte | 4 +- .../components/NFTs/NFTCards/NFTCard.svelte | 2 +- .../src/components/NFTs/NFTInfoDialog.svelte | 9 +- 6 files changed, 14 insertions(+), 110 deletions(-) diff --git a/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte b/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte index 481c7beb9d..50c88b27f2 100644 --- a/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte +++ b/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte @@ -44,9 +44,7 @@ function onBridgeClick() { bridging = true; - bridge().finally(() => { - bridging = false; - }); + bridge(); } //TODO: this should probably be checked somewhere else? diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte index e92adb00af..d1b7f9587f 100644 --- a/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte +++ b/packages/bridge-ui-v2/src/components/Bridge/NFTBridge.svelte @@ -79,103 +79,6 @@ }); } - // async function approve() { - // try { - // if (!$selectedToken || !$network || !$destinationChain) return; - // const type: TokenType = $selectedToken.type; - // const walletClient = await getConnectedWallet($network.id); - // let tokenAddress = await getAddress($selectedToken.addresses[$network.id]); - - // if (!tokenAddress) { - // const crossChainAddress = await getCrossChainAddress({ - // token: $selectedToken, - // srcChainId: $network.id, - // destChainId: $destinationChain.id, - // }); - // if (!crossChainAddress) throw new Error('cross chain address not found'); - // tokenAddress = crossChainAddress; - // } - // if (!tokenAddress) { - // throw new Error('token address not found'); - // } - // const tokenIds = - // nftIdArray.length > 0 - // ? nftIdArray.map((num) => BigInt(num)) - // : $selectedNFTs && $selectedNFTs.map((nft) => BigInt(nft.tokenId)); - - // let txHash: Hash; - - // const spenderAddress = - // type === TokenType.ERC1155 - // ? routingContractsMap[$network.id][$destinationChain.id].erc1155VaultAddress - // : routingContractsMap[$network.id][$destinationChain.id].erc721VaultAddress; - - // const args: NFTApproveArgs = { tokenIds: tokenIds!, tokenAddress, spenderAddress, wallet: walletClient }; - // txHash = await (bridges[type] as ERC721Bridge | ERC1155Bridge).approve(args); - - // const { explorer } = chainConfig[$network.id].urls; - - // if (txHash) - // infoToast({ - // title: $t('bridge.actions.approve.tx.title'), - // message: $t('bridge.actions.approve.tx.message', { - // values: { - // token: $selectedToken.symbol, - // url: `${explorer}/tx/${txHash}`, - // }, - // }), - // }); - - // await pendingTransactions.add(txHash, $network.id); - - // actionsComponent.checkTokensApproved(); - - // successToast({ - // title: $t('bridge.actions.approve.success.title'), - // message: $t('bridge.actions.approve.success.message', { - // values: { - // token: $selectedToken.symbol, - // }, - // }), - // }); - // } catch (err) { - // console.error(err); - // handleBridgeError(err as Error); - // } - // } - - // async function bridge() { - // if (!$bridgeService || !$selectedToken || !$network || !$destinationChain || !$account?.address) return; - - // try { - // const walletClient = await getConnectedWallet($network.id); - // const commonArgs = { - // to: $recipientAddress || $account.address, - // wallet: walletClient, - // srcChainId: $network.id, - // destChainId: $destinationChain.id, - // fee: $processingFee, - // }; - - // const tokenIds = - // nftIdArray.length > 0 - // ? nftIdArray.map((num) => BigInt(num)) - // : $selectedNFTs && $selectedNFTs.map((nft) => BigInt(nft.tokenId)); - - // const bridgeArgs = await getBridgeArgs($selectedToken, $enteredAmount, commonArgs, nftIdArray); - - // const args = { ...bridgeArgs, tokenIds }; - - // bridgeTxHash = await $bridgeService.bridge(args); - // activeStep = NFTSteps.CONFIRM; - - // //TODO: everything below should be handled differently for the stepper design. Still tbd - // } catch (err) { - // console.error(err); - // handleBridgeError(err as Error); - // } - // } - $: if ($selectedToken && amountComponent) { amountComponent.validateAmount(); } @@ -305,9 +208,7 @@ {$t('bridge.nft.step.confirm.title')} - +
diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ConfirmationStep.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ConfirmationStep.svelte index 01534fbccb..d7b412ea41 100644 --- a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ConfirmationStep.svelte +++ b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ConfirmationStep.svelte @@ -75,6 +75,7 @@ status: MessageStatus.NEW, timestamp: Date.now(), } as BridgeTransaction; + bridging = false; bridgeTxService.addTxByAddress(userAccount, bridgeTx); }); @@ -144,7 +145,7 @@ async function bridge() { if (!$bridgeService || !$selectedToken || !$network || !$destNetwork?.id || !$account?.address) return; - + bridging = true; try { const walletClient = await getConnectedWallet($network.id); const commonArgs = { @@ -168,6 +169,7 @@ handleBridgeTxHash(bridgeTxHash); } } catch (err) { + bridging = false; console.error(err); handleBridgeError(err as Error); } diff --git a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte index 7847b5f762..41b9a3fce7 100644 --- a/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte +++ b/packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ReviewStep.svelte @@ -121,8 +121,8 @@ NFT List or Card View
+Recipient & Processing Fee +-->
diff --git a/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCard.svelte b/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCard.svelte index 179e8f7cfb..cf353edd0f 100644 --- a/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCard.svelte +++ b/packages/bridge-ui-v2/src/components/NFTs/NFTCards/NFTCard.svelte @@ -6,7 +6,7 @@ export let nft: NFT; export let selectNFT: (nft: NFT) => void; - export let viewOnly = false; + export let viewOnly: boolean; const placeholderUrl = 'https://placehold.co/400x400.png'; diff --git a/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte b/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte index 3cd30c27ae..45a7f40f8e 100644 --- a/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte +++ b/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte @@ -41,7 +41,10 @@

{$t('bridge.nft.step.import.nft_card.title')}

- placeholder nft + placeholder nft
{$t('common.collection')}
@@ -76,7 +79,7 @@ @@ -84,7 +87,7 @@