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

FIX: crash when editing multisig cosigners and providing malformed data

Browse source
This commit is contained in:
overtorment 2024-01-30 21:26:43 +00:00
parent 0f8a74ba8a
commit 67f58b7992
2 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helpers/scan-qr.ts
View file

@ -9,10 +9,11 @@ import { check, request, PERMISSIONS, RESULTS } from 'react-native-permissions';
* @param currentScreenName {string}
* @param showFileImportButton {boolean}
*
* @param onDismiss {function} - if camera is closed via X button it gets triggered
* @return {Promise<string>}
*/
function scanQrHelper(
navigateFunc: (scr: string, params?: any) => void,
navigateFunc: (scr: string | any, params?: any) => void,
currentScreenName: string,
showFileImportButton = true,
onDismiss?: () => void,
@ -28,14 +29,15 @@ function scanQrHelper(
params.onBarScanned = function (data: any) {
setTimeout(() => resolve(data.data || data), 1);
navigateFunc(currentScreenName);
navigateFunc({ name: currentScreenName, params: {}, merge: true });
};
navigateFunc('ScanQRCodeRoot', {
screen: 'ScanQRCode',
params,
});
})}
);
});
});
}
const isCameraAuthorizationStatusGranted = async () => {

26
screen/wallets/viewEditMultisigCosigners.js
View file

@ -42,7 +42,7 @@ import { SquareButton } from '../../components/SquareButton';
import { encodeUR } from '../../blue_modules/ur';
import QRCodeComponent from '../../components/QRCodeComponent';
import alert from '../../components/Alert';
import { requestCameraAuthorization } from '../../helpers/scan-qr';
import { scanQrHelper } from '../../helpers/scan-qr';
import { useTheme } from '../../components/themes';
import Button from '../../components/Button';
const fs = require('../../blue_modules/fs');
@ -436,27 +436,11 @@ const ViewEditMultisigCosigners = () => {
});
};
const scanOrOpenFile = () => {
const scanOrOpenFile = async () => {
setIsProvideMnemonicsModalVisible(false);
setTimeout(
() =>
requestCameraAuthorization().then(() => {
NavigationService.navigate('ScanQRCodeRoot', {
screen: 'ScanQRCode',
params: {
launchedBy: route.name,
onBarScanned: result => {
// Triggers FlatList re-render
setImportText(result);
//
_handleUseMnemonicPhrase(result);
},
showFileImportButton: true,
},
});
}),
650,
);
const scanned = await scanQrHelper(NavigationService.navigate, route.name, true);
setImportText(String(scanned));
setIsProvideMnemonicsModalVisible(true);
};
const hideProvideMnemonicsModal = () => {