diff --git a/helpers/scan-qr.ts b/helpers/scan-qr.ts index 7d3be718e..2cedea8ea 100644 --- a/helpers/scan-qr.ts +++ b/helpers/scan-qr.ts @@ -15,13 +15,14 @@ function scanQrHelper( navigateFunc: (scr: string, params?: any) => void, currentScreenName: string, showFileImportButton = true, + onDismiss?: () => void, ): Promise { return requestCameraAuthorization().then(() => { return new Promise(resolve => { const params = { showFileImportButton: Boolean(showFileImportButton), onBarScanned: (data: any) => {}, - onDismiss: () => {}, + onDismiss, }; params.onBarScanned = function (data: any) { @@ -29,10 +30,6 @@ function scanQrHelper( navigateFunc(currentScreenName); }; - params.onDismiss = function () { - setTimeout(() => resolve(null), 1); - }; - navigateFunc('ScanQRCodeRoot', { screen: 'ScanQRCode', params, diff --git a/screen/send/ScanQRCode.js b/screen/send/ScanQRCode.js index 0693e4959..559026eb5 100644 --- a/screen/send/ScanQRCode.js +++ b/screen/send/ScanQRCode.js @@ -410,6 +410,8 @@ ScanQRCode.initialParams = { urTotal: undefined, urHave: undefined, backdoorText: '', + onDismiss: undefined, + showFileImportButton: true, backdoorVisible: false, animatedQRCodeData: {}, };