crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly detect user signing cancellation on Metamask, Parity signer and Ledger

Browse Source
This commit is contained in:
Fabio Berger 2018-01-28 10:28:17 +01:00
parent 71d68f975c
commit b4faa4851a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/website/ts/components/eth_weth_conversion_button.tsx
View File

@ -108,7 +108,7 @@ export class EthWethConversionButton extends React.Component<
const errMsg = `${err}`; const errMsg = `${err}`;
if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) { if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) {
this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
} else if (!_.includes(errMsg, 'User denied transaction')) { } else if (!utils.didUserDenyWeb3Request(errMsg)) {
utils.consoleLog(`Unexpected error encountered: ${err}`); utils.consoleLog(`Unexpected error encountered: ${err}`);
utils.consoleLog(err.stack); utils.consoleLog(err.stack);
const errorMsg = const errorMsg =

4
packages/website/ts/components/fill_order.tsx
View File

@ -573,7 +573,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
isFilling: false, isFilling: false,
}); });
const errMsg = `${err}`; const errMsg = `${err}`;
if (_.includes(errMsg, 'User denied transaction signature')) { if (utils.didUserDenyWeb3Request(errMsg)) {
return; return;
} }
globalErrMsg = 'Failed to fill order, please refresh and try again'; globalErrMsg = 'Failed to fill order, please refresh and try again';
@ -653,7 +653,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
isCancelling: false, isCancelling: false,
}); });
const errMsg = `${err}`; const errMsg = `${err}`;
if (_.includes(errMsg, 'User denied transaction signature')) { if (utils.didUserDenyWeb3Request(errMsg)) {
return; return;
} }
globalErrMsg = 'Failed to cancel order, please refresh and try again'; globalErrMsg = 'Failed to cancel order, please refresh and try again';

2
packages/website/ts/components/inputs/allowance_toggle.tsx
View File

@ -78,7 +78,7 @@ export class AllowanceToggle extends React.Component<AllowanceToggleProps, Allow
isSpinnerVisible: false, isSpinnerVisible: false,
}); });
const errMsg = `${err}`; const errMsg = `${err}`;
if (_.includes(errMsg, 'User denied transaction')) { if (utils.didUserDenyWeb3Request(errMsg)) {
return; return;
} }
utils.consoleLog(`Unexpected error encountered: ${err}`); utils.consoleLog(`Unexpected error encountered: ${err}`);

2
packages/website/ts/components/send_button.tsx
View File

@ -73,7 +73,7 @@ export class SendButton extends React.Component<SendButtonProps, SendButtonState
if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) { if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) {
this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
return; return;
} else if (!_.includes(errMsg, 'User denied transaction')) { } else if (!utils.didUserDenyWeb3Request(errMsg)) {
utils.consoleLog(`Unexpected error encountered: ${err}`); utils.consoleLog(`Unexpected error encountered: ${err}`);
utils.consoleLog(err.stack); utils.consoleLog(err.stack);
this.props.onError(); this.props.onError();

2
packages/website/ts/components/token_balances.tsx
View File

@ -519,7 +519,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
return false; return false;
} }
if (_.includes(errMsg, 'User denied transaction')) { if (utils.didUserDenyWeb3Request(errMsg)) {
return false; return false;
} }
utils.consoleLog(`Unexpected error encountered: ${err}`); utils.consoleLog(`Unexpected error encountered: ${err}`);

2
packages/website/ts/utils/utils.ts
View File

@ -183,7 +183,7 @@ export const utils = {
// after a user was prompted to sign a message or send a transaction and decided to // after a user was prompted to sign a message or send a transaction and decided to
// reject the request. // reject the request.
didUserDenyWeb3Request(errMsg: string) { didUserDenyWeb3Request(errMsg: string) {
const metamaskDenialErrMsg = 'User denied message'; const metamaskDenialErrMsg = 'User denied';
const paritySignerDenialErrMsg = 'Request has been rejected'; const paritySignerDenialErrMsg = 'Request has been rejected';
const ledgerDenialErrMsg = 'Invalid status 6985'; const ledgerDenialErrMsg = 'Invalid status 6985';
const isUserDeniedErrMsg = const isUserDeniedErrMsg =