This commit is contained in:
Bill He 2023-10-23 13:22:12 -07:00
parent 4b85ec7df0
commit e1e817ea92
No known key found for this signature in database
GPG Key ID: 73AEEF9D79E5BBF8
4 changed files with 17 additions and 15 deletions

View File

@ -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",

8
pnpm-lock.yaml generated
View File

@ -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:

View File

@ -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 (
<Styled.Dialog
isOpen={Boolean(currentOnboardingStep)}
setIsOpen={setIsOpen}
setIsOpen={setIsOpenFromDialog}
{...(currentOnboardingStep &&
{
[OnboardingSteps.ChooseWallet]: {
@ -87,7 +94,7 @@ export const OnboardingDialog = ({ setIsOpen }: ElementProps) => {
title: stringGetter({ key: STRING_KEYS.ACKNOWLEDGE_TERMS }),
children: (
<Styled.Content>
<AcknowledgeTerms onClose={() => setIsOpen?.(false)} />
<AcknowledgeTerms onClose={() => setIsOpenFromDialog?.(false)} />
</Styled.Content>
),
width: '30rem',

View File

@ -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 (
<>
<p>
@ -60,7 +55,7 @@ export const AcknowledgeTerms = ({ onClose, onContinue }: ElementProps) => {
</ul>
</Styled.TOS>
<Styled.Row>
<Styled.Button onClick={onDecline} action={ButtonAction.Base}>
<Styled.Button onClick={onClose} action={ButtonAction.Base}>
{stringGetter({ key: STRING_KEYS.CLOSE })}
</Styled.Button>
<Styled.Button onClick={onAcknowledgement} action={ButtonAction.Primary}>