diff --git a/package.json b/package.json index 025e204..818ef7d 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@cosmjs/tendermint-rpc": "^0.31.0", "@dydxprotocol/v4-abacus": "^0.7.2", "@dydxprotocol/v4-client-js": "^0.40.3", - "@dydxprotocol/v4-localization": "^0.1.31", + "@dydxprotocol/v4-localization": "^0.1.32", "@ethersproject/providers": "^5.7.2", "@js-joda/core": "^5.5.3", "@radix-ui/react-collapsible": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a33ab5f..a0cda0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,8 @@ dependencies: specifier: ^0.40.3 version: 0.40.3 '@dydxprotocol/v4-localization': - specifier: ^0.1.31 - version: 0.1.31 + specifier: ^0.1.32 + version: 0.1.32 '@ethersproject/providers': specifier: ^5.7.2 version: 5.7.2 @@ -1011,8 +1011,8 @@ packages: - utf-8-validate dev: false - /@dydxprotocol/v4-localization@0.1.31: - resolution: {integrity: sha512-hjWul8SazSneK37v9qM1gMkO37MncaObtvLzVQuaJDKjb0ojdHVWiIPETwQy/lV5ufR1isxYKMefVPVYQg0fAA==} + /@dydxprotocol/v4-localization@0.1.32: + resolution: {integrity: sha512-ZtXScxgFLjUt0Ag52RyFnQe9aEl1Aky5fp+vMGOBduVkFiCEMRMkSsSgg6grMdyw/x0AbnxOTRkhYoX2MsK9Ow==} dev: false /@dydxprotocol/v4-proto@0.4.1: diff --git a/src/views/dialogs/OnboardingDialog.tsx b/src/views/dialogs/OnboardingDialog.tsx index d7132ad..d8c049d 100644 --- a/src/views/dialogs/OnboardingDialog.tsx +++ b/src/views/dialogs/OnboardingDialog.tsx @@ -37,7 +37,7 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => { const stringGetter = useStringGetter(); const { isMobile } = useBreakpoints(); - const { walletType } = useAccounts(); + const { disconnect, walletType } = useAccounts(); const currentOnboardingStep = useSelector(calculateOnboardingStep); @@ -45,10 +45,17 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => { if (!currentOnboardingStep) setIsOpen?.(false); }, [currentOnboardingStep]); + const setIsOpenFromDialog = (open: boolean) => { + if (!open && currentOnboardingStep === OnboardingSteps.AcknowledgeTerms) { + disconnect(); + } + setIsOpen?.(open); + } + return ( { title: stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TERMS }), children: ( - setIsOpen?.(false)} /> + setIsOpenFromDialog?.(false)} /> ), width: '30rem', diff --git a/src/views/dialogs/OnboardingDialog/AcknowledgeTerms.tsx b/src/views/dialogs/OnboardingDialog/AcknowledgeTerms.tsx index 41783e4..daa1355 100644 --- a/src/views/dialogs/OnboardingDialog/AcknowledgeTerms.tsx +++ b/src/views/dialogs/OnboardingDialog/AcknowledgeTerms.tsx @@ -19,18 +19,13 @@ type ElementProps = { export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => { const stringGetter = useStringGetter(); - const { disconnect, saveHasAcknowledgedTerms } = useAccounts(); + const { saveHasAcknowledgedTerms } = useAccounts(); const onAcknowledgement = () => { saveHasAcknowledgedTerms(true); onContinue?.(); }; - const onDecline = () => { - disconnect(); - onClose?.(); - } - return ( <>

@@ -60,7 +55,7 @@ export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => { - + {stringGetter({ key: STRING_KEYS.CLOSE })}