fix: update switch chain logic #1916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
dewanshparashar
previously approved these changes
Sep 24, 2024
chrstph-dvx
previously approved these changes
Sep 26, 2024
|
We should update this code, because |
fionnachan
commented
Sep 30, 2024
| @@ -105,7 +116,8 @@ export function TransferPanel() { | |||
| const { switchNetworkAsync } = useSwitchNetworkWithConfig({ | |||
| isSwitchingNetworkBeforeTx: true | |||
| }) | |||
| const chainId = useChainId() | |||
| // do not use `useChainId` because it won't detect chains outside of our wagmi config | |||
| const latestChain = useLatest(useNetwork()) | |||
There was a problem hiding this comment.
because we use it in an async function, we must use useLatest to ensure it's up-to-date
Comment on lines
355
to
357
| if (!isTransferAllowed) { | ||
| return | ||
| } |
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Outdated
Show resolved
Hide resolved
Comment on lines
957
to
980
| try { | ||
| setTransferring(true) | ||
| if (isConnectedToTheWrongChain) { | ||
| trackEvent('Switch Network and Transfer', { | ||
| type: isTeleportMode | ||
| ? 'Teleport' | ||
| : isDepositMode | ||
| ? 'Deposit' | ||
| : 'Withdrawal', | ||
| tokenSymbol: selectedToken?.symbol, | ||
| assetType: selectedToken ? 'ERC-20' : 'ETH', | ||
| accountType: isSmartContractWallet ? 'Smart Contract' : 'EOA', | ||
| network: childChainName, | ||
| amount: Number(amount), | ||
| amount2: isBatchTransfer ? Number(amount2) : undefined, | ||
| version: 2 | ||
| }) | ||
| await switchNetworkAsync?.(sourceChainId) | ||
| } | ||
| } catch (error) { | ||
| return networkConnectionWarningToast() | ||
| } finally { | ||
| setTransferring(false) | ||
| } |
There was a problem hiding this comment.
Moved the chain switching out here so that it is used for all kinds of transfers.
| } finally { | ||
| setTransferring(false) | ||
| } | ||
| const sourceChainId = latestNetworks.current.sourceChain.id | ||
|
|
||
| if (!isTransferAllowed) { |
There was a problem hiding this comment.
when user reached here, the connected chain must be the source chain, or else it won't proceed.
dewanshparashar
previously approved these changes
Oct 1, 2024
fionnachan
commented
Oct 1, 2024
Comment on lines
+22
to
+29
| const isConnectedToTheWrongChain = chain?.id !== networks.sourceChain.id | ||
|
|
||
| if (!arbTokenBridgeLoaded) { | ||
| return false | ||
| } | ||
| if (!eth) { | ||
| return false | ||
| } |
There was a problem hiding this comment.
These conditions were in the while await Promise loop.
Since the while loop is deleted, they are added here to prevent transfers.
brtkx
reviewed
Oct 1, 2024
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Outdated
Show resolved
Hide resolved
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Show resolved
Hide resolved
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Show resolved
Hide resolved
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Outdated
Show resolved
Hide resolved
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Outdated
Show resolved
Hide resolved
brtkx
reviewed
Oct 1, 2024
packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx
Show resolved
Hide resolved
brtkx
approved these changes
Oct 1, 2024
dewanshparashar
approved these changes
Oct 1, 2024
fionnachan
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes FS-859