Skip to content
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

Fix: Automatic WC redirect back to browser is broken on iOS 17 #5127

Merged
merged 11 commits into from
Oct 20, 2023
Merged

Fix: Automatic WC redirect back to browser is broken on iOS 17 #5127

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
76d9303
add WALLET_CONNECT_REDIRECT_SHEET navigation on connection
walmat Oct 17, 2023
e6133cc
fix: lint picked up merging filepaths together issue
walmat Oct 17, 2023
7192fc5
fix ios 16 regression
walmat Oct 18, 2023
fab82d1
revert: pbx file
walmat Oct 18, 2023
72d48f8
revert: pbx file
walmat Oct 18, 2023
ff139f5
revert: pbx file
walmat Oct 18, 2023
6dfda0d
sign
walmat Oct 18, 2023
53a3174
Merge branch 'develop' into @matthew/APP-827
walmat Oct 20, 2023
9450376
fix: guard minimizer.goBack functionality to Android only
walmat Oct 20, 2023
28c1f88
fix: sign window not closing and not showing sign txn redirect sheet
walmat Oct 20, 2023
e125d0c
Merge branch 'develop' into @matthew/APP-827
walmat Oct 20, 2023
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
5 changes: 4 additions & 1 deletion src/screens/WalletConnectApprovalSheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,11 @@ export default function WalletConnectApprovalSheet() {
const handleConnect = useCallback(() => {
handled.current = true;
goBack();
navigate(Routes.WALLET_CONNECT_REDIRECT_SHEET, {
type: 'connect',
});
handleSuccess(true);
}, [handleSuccess, goBack]);
}, [handleSuccess, goBack, navigate]);

const handleCancel = useCallback(() => {
handled.current = true;
Expand Down
6 changes: 5 additions & 1 deletion src/walletConnect/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,11 @@ export async function onSessionProposal(
dappUrl: proposer.metadata.url,
});

maybeGoBackAndClearHasPendingRedirect();
// NOTE: iOS 17 broke our minimizer.goBack functionality so guard this until we can fix it
// ref: https://stackoverflow.com/questions/42516357/how-does-googles-custom-ios-keyboard-gboard-programmatically-dismiss-the-fron
if (IS_ANDROID) {
maybeGoBackAndClearHasPendingRedirect();
}
} else {
await rejectProposal({
proposal,
Expand Down
Loading