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

chore: cherry-pick #11592 #11684

Merged
merged 3 commits into from
Oct 8, 2024
Merged

chore: cherry-pick #11592 #11684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e17c39
fix: fix walletconnect source validation (#11592)
elefantel Oct 7, 2024
a35b04f
Merge branch 'release/7.33.0' into chore/cherry-pick-11592
NicolasMassart Oct 8, 2024
26744da
Merge branch 'release/7.33.0' into chore/cherry-pick-11592
NicolasMassart Oct 8, 2024
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
15 changes: 11 additions & 4 deletions app/components/Views/confirmations/Approval/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,17 @@ class Approval extends PureComponent {
const wc2Manager = await WC2Manager.getInstance();
const sessions = wc2Manager.getSessions();
this.originIsWalletConnect = sessions.some((session) => {
DevLogger.log(
`Approval::detectOrigin Comparing session URL ${session.peer.metadata.url} with origin ${origin}`,
);
return session.peer.metadata.url === origin;
// Otherwise, compare the origin with the metadata URL
if (
session.peer.metadata.url === origin ||
origin.startsWith(WALLET_CONNECT_ORIGIN)
) {
DevLogger.log(
`Approval::detectOrigin Comparing session URL ${session.peer.metadata.url} with origin ${origin}`,
);
return true;
}
return false;
});
}
DevLogger.log(
Expand Down
7 changes: 6 additions & 1 deletion app/components/Views/confirmations/components/ApproveTransactionReview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import { createBuyNavigationDetails } from '../../../../UI/Ramp/routes/utils';
import SDKConnect from '../../../../../core/SDKConnect/SDKConnect';
import DevLogger from '../../../../../core/SDKConnect/utils/DevLogger';
import { WC2Manager } from '../../../../../core/WalletConnect/WalletConnectV2';
import { WALLET_CONNECT_ORIGIN } from '../../../../../util/walletconnect';

const { ORIGIN_DEEPLINK, ORIGIN_QR_CODE } = AppConstants.DEEPLINKS;
const POLLING_INTERVAL_ESTIMATED_L1_FEE = 30000;
Expand Down Expand Up @@ -362,7 +363,11 @@ class ApproveTransactionReview extends PureComponent {
// Check if it is walletConnect origin
WC2Manager.getInstance().then((wc2) => {
this.originIsWalletConnect = wc2.getSessions().some((session) => {
if (session.peer.metadata.url === origin) {
// Otherwise, compare the origin with the metadata URL
if (
session.peer.metadata.url === origin ||
origin.startsWith(WALLET_CONNECT_ORIGIN)
) {
DevLogger.log(
`ApproveTransactionReview::componentDidMount Found matching session for origin ${origin}`,
);
Expand Down
2 changes: 0 additions & 2 deletions app/core/AppConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ export default {
WC: 'WalletConnect',
WC2: 'WalletConnectV2',
IN_APP_BROWSER: 'In-App-Browser',
SDK_ANDROID: 'MetaMask-SDK-Android',
SDK_IOS: 'MetaMask-SDK-IOS',
},
MM_SDK: {
SDK_CONNECTIONS: 'sdkConnections',
Expand Down
Loading