mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 23:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6204 from BlueWallet/fix-ms-scan

Browse source 
FIX: could not scan cosigner when creating a multisig fault (closes #…
This commit is contained in:
GLaDOS 2024-03-01 04:28:26 +00:00 • committed by GitHub
commit f1dee689d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
screen/wallets/addMultisigStep2.js
View file

@ -52,6 +52,7 @@ const WalletsAddMultisigStep2 = () => {
const navigation = useNavigation(); const navigation = useNavigation();
const { m, n, format, walletLabel } = useRoute().params; const { m, n, format, walletLabel } = useRoute().params;
const { name } = useRoute();
const [cosigners, setCosigners] = useState([]); // array of cosigners user provided. if format [cosigner, fp, path] const [cosigners, setCosigners] = useState([]); // array of cosigners user provided. if format [cosigner, fp, path]
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
@ -371,7 +372,6 @@ const WalletsAddMultisigStep2 = () => {
}; };
const onBarScanned = ret => { const onBarScanned = ret => {
if (!isDesktop) navigation.getParent().pop();
if (!ret.data) ret = { data: ret }; if (!ret.data) ret = { data: ret };
try { try {
@ -472,7 +472,10 @@ const WalletsAddMultisigStep2 = () => {
fs.showActionSheet({ anchor: findNodeHandle(openScannerButton.current) }).then(onBarScanned); fs.showActionSheet({ anchor: findNodeHandle(openScannerButton.current) }).then(onBarScanned);
} else { } else {
setIsProvideMnemonicsModalVisible(false); setIsProvideMnemonicsModalVisible(false);
InteractionManager.runAfterInteractions(() => scanQrHelper(navigation.navigate, onBarScanned)); InteractionManager.runAfterInteractions(async () => {
const scanned = await scanQrHelper(navigation.navigate, name, true);
onBarScanned({ data: scanned });
});
} }
}; };