Skip to content

fix(scanner): navigate away before processing EIP-681 URIs #7257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielSinclair wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(scanner): navigate away before processing EIP-681 URIs #7257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/hooks/useScanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,15 @@ export default function useScanner(enabled: boolean, onSuccess: () => unknown) {
enabledVar.current = enabled;
}, [enabled, disableScanning, enableScanning]);

const handleScanEthereumUrl = useCallback((data: string) => {
ethereumUtils.parseEthereumUrl(data);
}, []);
const handleScanEthereumUrl = useCallback(
(data: string) => {
// Navigate away first — prevents the QRScannerScreen beforeRemove listener from
// intercepting the SEND_FLOW navigation and looping forever.
navigate(Routes.WALLET_SCREEN);
ethereumUtils.parseEthereumUrl(data);
},
[navigate]
);

const handleScanAddress = useCallback(
async (address: string) => {
Expand Down Expand Up @@ -140,8 +146,6 @@ export default function useScanner(enabled: boolean, onSuccess: () => unknown) {

// EIP 681 / 831
if (data.startsWith('ethereum:')) {
onSuccess();

return handleScanEthereumUrl(data);
}
const address = await addressUtils.getEthereumAddressFromQRCodeData(data);
Expand Down
Loading