Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow scw to change destination chain #2139

Merged
merged 9 commits into from
Jan 17, 2025
Merged

feat: allow scw to change destination chain #2139

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ebf0bb3
feat: allow scw to change destination chain
fionnachan Dec 13, 2024
010610f
Merge branch 'master' into allow-destination-selection-scw
fionnachan Dec 24, 2024
bf71233
Merge remote-tracking branch 'origin/master' into allow-destination-s…
fionnachan Dec 27, 2024
e0fff84
update
fionnachan Dec 27, 2024
6e2a273
remove unused line
fionnachan Jan 8, 2025
68afc66
Merge branch 'master' into allow-destination-selection-scw
fionnachan Jan 13, 2025
cea9025
Merge branch 'master' into allow-destination-selection-scw
fionnachan Jan 13, 2025
31a412f
Merge branch 'master' into allow-destination-selection-scw
spsjvc Jan 17, 2025
2235a90
undo unnecessary change
fionnachan Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/arb-token-bridge-ui/src/components/TransferPanel/AdvancedSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ export const AdvancedSettings = () => {
isDepositMode
} = useNetworksRelationship(networks)
const { address } = useAccount()
const { isEOA, isSmartContractWallet } = useAccountType()
const {
isEOA,
isSmartContractWallet,
isLoading: isLoadingAccountType
} = useAccountType()

const [inputLocked, setInputLocked] = useState(true)
const [warning, setWarning] = useState<string | null>(null)
Expand Down Expand Up @@ -113,6 +117,7 @@ export const AdvancedSettings = () => {
)
}, [
initialDestinationAddressFromQueryParams,
isLoadingAccountType,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not used in this useEffect hook, why is it added?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i used it in some commits but deleted the lines and forgot to remove it from the dependency array~ thanks!

isEOA,
setAdvancedSettingsCollapsed
])
Expand Down
14 changes: 11 additions & 3 deletions packages/arb-token-bridge-ui/src/components/common/NetworkSelectionContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ export function NetworkButton({

const hasOneOrLessChain = chains.length <= 1

const disabled = hasOneOrLessChain || isSmartContractWallet || isLoading
const disabled =
hasOneOrLessChain ||
(isSmartContractWallet && type === 'source') ||
isLoading

const buttonStyle = {
backgroundColor: getBridgeUiConfigForChain(selectedChainId).color
Expand Down Expand Up @@ -404,6 +407,7 @@ export const NetworkSelectionContainer = (
const [oneNovaTransferDialogProps, openOneNovaTransferDialog] = useDialog()
const [, setQueryParams] = useArbQueryParams()
const { setAdvancedSettingsCollapsed } = useAdvancedSettingsStore()
const { isSmartContractWallet } = useAccountType()

const isSource = props.type === 'source'

Expand Down Expand Up @@ -441,7 +445,10 @@ export const NetworkSelectionContainer = (

actions.app.setSelectedToken(null)
setQueryParams({ destinationAddress: undefined })
setAdvancedSettingsCollapsed(true)

if (!isSmartContractWallet) {
setAdvancedSettingsCollapsed(true)
}
},
[
isSource,
Expand All @@ -450,7 +457,8 @@ export const NetworkSelectionContainer = (
actions.app,
setQueryParams,
setAdvancedSettingsCollapsed,
openOneNovaTransferDialog
openOneNovaTransferDialog,
isSmartContractWallet
]
)

Expand Down
Loading