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.

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

Fix "User cannot uncheck the checkbox of the privacy notice" #3045

Merged
merged 4 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class WalletBackupActions {
password: string,
|}> = new Action();
continueToPrivacyWarning: Action<void> = new Action();
acceptPrivacyNoticeForWalletBackup: Action<void> = new Action();
togglePrivacyNoticeForWalletBackup: Action<void> = new Action();
continueToRecoveryPhraseForWalletBackup: Action<void> = new Action();
addWordToWalletBackupVerification: Action<{| word: string, index: number |}> = new Action();
clearEnteredRecoveryPhrase: Action<void> = new Action();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type Props = {|
index: number,
|}>,
+onCancelBackup: void => void,
+onAcceptPrivacyNotice: void => void,
+onTogglePrivacyNotice: void => void,
+onContinue: void => void,
+onBack: void => void,
+onStartWalletBackup: void => void,
Expand All @@ -47,7 +47,7 @@ export default class WalletBackupDialog extends Component<Props> {
const {
currentStep, onCancelBackup,
canPhraseBeShown, isPrivacyNoticeAccepted,
countdownRemaining, onAcceptPrivacyNotice,
countdownRemaining, togglePrivacyNotice,
onContinue, onBack, recoveryPhrase,
onStartWalletBackup, isTermDeviceAccepted,
enteredPhrase, removeWord, hasWord,
Expand All @@ -63,7 +63,7 @@ export default class WalletBackupDialog extends Component<Props> {
canPhraseBeShown={canPhraseBeShown}
isPrivacyNoticeAccepted={isPrivacyNoticeAccepted}
countdownRemaining={countdownRemaining}
onAcceptPrivacyNotice={onAcceptPrivacyNotice}
togglePrivacyNotice={togglePrivacyNotice}
onCancelBackup={onCancelBackup}
onContinue={onContinue}
classicTheme={classicTheme}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Props = {|
+countdownRemaining: number,
+canPhraseBeShown: boolean,
+isPrivacyNoticeAccepted: boolean,
+onAcceptPrivacyNotice: void => void,
+togglePrivacyNotice: void => void,
+onContinue: void => void,
+onCancelBackup: void => void,
+classicTheme: boolean
Expand All @@ -48,7 +48,7 @@ export default class WalletBackupPrivacyWarningDialog extends Component<Props> {
const {
countdownRemaining,
canPhraseBeShown,
onAcceptPrivacyNotice,
togglePrivacyNotice,
onCancelBackup,
isPrivacyNoticeAccepted,
onContinue,
Expand Down Expand Up @@ -85,7 +85,7 @@ export default class WalletBackupPrivacyWarningDialog extends Component<Props> {
<div className={styles.checkbox}>
<CheckboxLabel
label={intl.formatMessage(messages.termNobodyWatching)}
onChange={onAcceptPrivacyNotice}
onChange={togglePrivacyNotice}
checked={isPrivacyNoticeAccepted}
labelSx={{ fontSize: '0.875rem' }}
sx={{ marginTop: '20px' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ const walletBackupProps: {|
finishWalletBackup: { trigger: async (req) => action('finishWalletBackup')(req), },
removeOneMnemonicWord: { trigger: action('removeOneMnemonicWord'), },
continueToPrivacyWarning: { trigger: action('continueToPrivacyWarning'), },
acceptPrivacyNoticeForWalletBackup: { trigger: action('acceptPrivacyNoticeForWalletBackup'), },
togglePrivacyNoticeForWalletBackup: { trigger: action('togglePrivacyNoticeForWalletBackup'), },
continueToRecoveryPhraseForWalletBackup: { trigger: action('continueToRecoveryPhraseForWalletBackup'), },
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class WalletBackupDialogContainer extends Component<Props> {
finishWalletBackup,
removeOneMnemonicWord,
continueToPrivacyWarning,
acceptPrivacyNoticeForWalletBackup,
togglePrivacyNoticeForWalletBackup,
continueToRecoveryPhraseForWalletBackup
} = actions.walletBackup;
const { createWalletRequest } = stores.wallets;
Expand All @@ -63,7 +63,7 @@ export default class WalletBackupDialogContainer extends Component<Props> {
canPhraseBeShown={isPrivacyNoticeAccepted && countdownRemaining === 0}
isPrivacyNoticeAccepted={isPrivacyNoticeAccepted}
countdownRemaining={countdownRemaining}
onAcceptPrivacyNotice={acceptPrivacyNoticeForWalletBackup.trigger}
togglePrivacyNotice={togglePrivacyNoticeForWalletBackup.trigger}
onBack={continueToPrivacyWarning.trigger}
onContinue={continueToRecoveryPhraseForWalletBackup.trigger}
// Props for WalletRecoveryPhraseDisplayDialog
Expand Down Expand Up @@ -94,7 +94,7 @@ export default class WalletBackupDialogContainer extends Component<Props> {
@computed get generated(): {|
actions: {|
walletBackup: {|
acceptPrivacyNoticeForWalletBackup: {|
togglePrivacyNoticeForWalletBackup: {|
trigger: (params: void) => void
|},
acceptWalletBackupTermDevice: {|
Expand Down Expand Up @@ -217,8 +217,8 @@ export default class WalletBackupDialogContainer extends Component<Props> {
continueToPrivacyWarning: {
trigger: actions.walletBackup.continueToPrivacyWarning.trigger,
},
acceptPrivacyNoticeForWalletBackup: {
trigger: actions.walletBackup.acceptPrivacyNoticeForWalletBackup.trigger,
togglePrivacyNoticeForWalletBackup: {
trigger: actions.walletBackup.togglePrivacyNoticeForWalletBackup.trigger,
},
continueToRecoveryPhraseForWalletBackup: {
trigger: actions.walletBackup.continueToRecoveryPhraseForWalletBackup.trigger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class WalletBackupStore extends Store<StoresMap, ActionsMap> {
const a = this.actions.walletBackup;
a.initiateWalletBackup.listen(this._initiateWalletBackup);
a.continueToPrivacyWarning.listen(this._continueToPrivacyWarning);
a.acceptPrivacyNoticeForWalletBackup.listen(this._acceptPrivacyNoticeForWalletBackup);
a.togglePrivacyNoticeForWalletBackup.listen(this._togglePrivacyNoticeForWalletBackup);
a.continueToRecoveryPhraseForWalletBackup.listen(this._continueToRecoveryPhraseForWalletBackup);
a.startWalletBackup.listen(this._startWalletBackup);
a.addWordToWalletBackupVerification.listen(this._addWordToWalletBackupVerification);
Expand Down Expand Up @@ -100,8 +100,8 @@ class WalletBackupStore extends Store<StoresMap, ActionsMap> {
this.currentStep = 'privacyWarning';
};

@action _acceptPrivacyNoticeForWalletBackup: void => void = () => {
this.isPrivacyNoticeAccepted = true;
@action _togglePrivacyNoticeForWalletBackup: void => void = () => {
this.isPrivacyNoticeAccepted = !this.isPrivacyNoticeAccepted;
};

@action _continueToRecoveryPhraseForWalletBackup: void => void = () => {
Expand Down