diff --git a/navigation/SendDetailsStackParamList.ts b/navigation/SendDetailsStackParamList.ts index f47e77627..ef7028f2a 100644 --- a/navigation/SendDetailsStackParamList.ts +++ b/navigation/SendDetailsStackParamList.ts @@ -79,18 +79,4 @@ export type SendDetailsStackParamList = { PaymentCodeList: { walletID: string; }; - ScanQRCodeRoot: { - screen: string; - params: { - isLoading?: boolean; - cameraStatusGranted?: boolean; - backdoorPressed?: boolean; - launchedBy?: string; - urTotal?: number; - urHave?: number; - backdoorText?: string; - showFileImportButton?: boolean; - onBarScanned: (data: string) => void; - }; - }; }; diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index ec4ef0cf6..fb0f91868 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -39,7 +39,7 @@ import Button from '../../components/Button'; import CoinsSelected from '../../components/CoinsSelected'; import InputAccessoryAllFunds, { InputAccessoryAllFundsAccessoryViewID } from '../../components/InputAccessoryAllFunds'; import { useTheme } from '../../components/themes'; -import { requestCameraAuthorization, scanQrHelper } from '../../helpers/scan-qr'; +import { scanQrHelper } from '../../helpers/scan-qr'; import loc, { formatBalance, formatBalanceWithoutSuffix } from '../../loc'; import { BitcoinUnit, Chain } from '../../models/bitcoinUnits'; import NetworkTransactionFees, { NetworkTransactionFee } from '../../models/networkTransactionFees'; @@ -679,22 +679,13 @@ const SendDetails = () => { * * @returns {Promise} */ - const importQrTransaction = () => { + const importQrTransaction = async () => { if (wallet?.type !== WatchOnlyWallet.type) { return presentAlert({ title: loc.errors.error, message: 'Importing transaction in non-watchonly wallet (this should never happen)' }); } - requestCameraAuthorization().then(() => { - feeModalRef.current?.dismiss(); - - navigation.navigate('ScanQRCodeRoot', { - screen: 'ScanQRCode', - params: { - onBarScanned: importQrTransactionOnBarScanned, - showFileImportButton: false, - }, - }); - }); + const data = await scanQrHelper(route.name, true); + importQrTransactionOnBarScanned(data); }; const importQrTransactionOnBarScanned = (ret: any) => { @@ -852,15 +843,8 @@ const SendDetails = () => { }; const importTransactionMultisigScanQr = async () => { - await requestCameraAuthorization().then(() => { - navigation.navigate('ScanQRCodeRoot', { - screen: 'ScanQRCode', - params: { - onBarScanned, - showFileImportButton: true, - }, - }); - }); + const data = await scanQrHelper(route.name, true); + onBarScanned(data); }; const handleAddRecipient = () => { diff --git a/screen/send/psbtWithHardwareWallet.js b/screen/send/psbtWithHardwareWallet.js index af7f91595..8470a8bd0 100644 --- a/screen/send/psbtWithHardwareWallet.js +++ b/screen/send/psbtWithHardwareWallet.js @@ -215,8 +215,9 @@ const PsbtWithHardwareWallet = () => { } }; - const openScanner = () => { - scanQrHelper(route.name, false, onBarScanned); + const openScanner = async () => { + const scannedData = await scanQrHelper(route.name, true); + onBarScanned({ data: scannedData }); }; if (txHex) return _renderBroadcastHex();