mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-19 09:50:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4328 from BlueWallet/allowcancel

Browse Source 
FIX: Allow multisig import cancel
This commit is contained in:
GLaDOS 2022-01-07 11:47:10 +00:00 committed by GitHub
commit e7160a4aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
screen/wallets/addMultisigStep2.js
View File

@ -270,17 +270,26 @@ const WalletsAddMultisigStep2 = () => {
alert(loc.multisig.not_a_multisignature_xpub);
return;
}
let fp = await prompt(loc.multisig.input_fp, loc.multisig.input_fp_explain, false, 'plain-text');
fp = (fp + '').toUpperCase();
if (!MultisigHDWallet.isFpValid(fp)) fp = '00000000';
let path = await prompt(
loc.multisig.input_path,
loc.formatString(loc.multisig.input_path_explain, { default: getPath() }),
false,
'plain-text',
);
if (!MultisigHDWallet.isPathValid(path)) path = getPath();
let fp;
try {
fp = await prompt(loc.multisig.input_fp, loc.multisig.input_fp_explain, true, 'plain-text');
fp = (fp + '').toUpperCase();
if (!MultisigHDWallet.isFpValid(fp)) fp = '00000000';
} catch {
return setIsLoading(false);
}
let path;
try {
path = await prompt(
loc.multisig.input_path,
loc.formatString(loc.multisig.input_path_explain, { default: getPath() }),
true,
'plain-text',
);
if (!MultisigHDWallet.isPathValid(path)) path = getPath();
} catch {
return setIsLoading(false);
}
setIsProvideMnemonicsModalVisible(false);
setIsLoading(false);