From bf329c6dea96fb1e13e2fd30440e944a800af61a Mon Sep 17 00:00:00 2001 From: ignaciosantise Date: Wed, 3 Jul 2024 12:04:30 -0300 Subject: [PATCH 01/10] feat: changes to support link mode --- apps/native/App.tsx | 7 ++++--- apps/native/src/utils/misc.ts | 13 ++++++++---- .../src/controllers/ConnectionController.ts | 9 ++++++--- packages/core/src/utils/CoreHelperUtil.ts | 20 ++++++++++++++++++- packages/core/src/utils/TypeUtil.ts | 2 ++ .../partials/w3m-connecting-mobile/index.tsx | 6 +++--- .../src/views/w3m-connecting-view/index.tsx | 3 ++- packages/wagmi/src/client.ts | 16 ++++++++------- 8 files changed, 54 insertions(+), 22 deletions(-) diff --git a/apps/native/App.tsx b/apps/native/App.tsx index 656da2c3..b6eb4307 100644 --- a/apps/native/App.tsx +++ b/apps/native/App.tsx @@ -30,7 +30,9 @@ const metadata = { url: 'https://walletconnect.com/', icons: ['https://avatars.githubusercontent.com/u/37784886'], redirect: { - native: 'redirect://' + native: 'redirect://', + universal: 'https://lab.web3modal.com/appkit_rn', + linkMode: true } }; @@ -45,8 +47,7 @@ const emailConn = emailConnector({ projectId, metadata }); const wagmiConfig = defaultWagmiConfig({ chains, projectId, - metadata, - extraConnectors: [emailConn] + metadata }); const queryClient = new QueryClient(); diff --git a/apps/native/src/utils/misc.ts b/apps/native/src/utils/misc.ts index 3da47146..e76735d5 100644 --- a/apps/native/src/utils/misc.ts +++ b/apps/native/src/utils/misc.ts @@ -7,14 +7,16 @@ export const getCustomWallets = () => { name: 'Wallet(RN)', image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', - mobile_link: 'rn-web3wallet://' + mobile_link: 'rn-web3wallet://', + link_mode: 'https://dev.lab.web3modal.com/walletkit_rn' }, { id: 'flutter-wallet', name: 'Wallet(Flutter)', image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', - mobile_link: 'wcflutterwallet://' + mobile_link: 'wcflutterwallet://', + link_mode: undefined } ]; @@ -24,7 +26,9 @@ export const getCustomWallets = () => { name: 'Wallet(Android)', image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', - mobile_link: 'kotlin-web3wallet://' + mobile_link: 'kotlin-web3wallet://', + link_mode: + 'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet' }); } else if (Platform.OS === 'ios') { wallets.push({ @@ -32,7 +36,8 @@ export const getCustomWallets = () => { name: 'Wallet(iOS)', image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', - mobile_link: 'walletapp://' + mobile_link: 'walletapp://', + link_mode: 'https://lab.web3modal.com/wallet' }); } diff --git a/packages/core/src/controllers/ConnectionController.ts b/packages/core/src/controllers/ConnectionController.ts index f4dca322..78c45ad5 100644 --- a/packages/core/src/controllers/ConnectionController.ts +++ b/packages/core/src/controllers/ConnectionController.ts @@ -15,7 +15,10 @@ export interface ConnectExternalOptions { } export interface ConnectionControllerClient { - connectWalletConnect: (onUri: (uri: string) => void) => Promise; + connectWalletConnect: ( + onUri: (uri: string) => void, + walletUniversalLink?: string + ) => Promise; connectExternal?: (options: ConnectExternalOptions) => Promise; signMessage: (message: string) => Promise; disconnect: () => Promise; @@ -66,13 +69,13 @@ export const ConnectionController = { state._client = ref(client); }, - connectWalletConnect() { + connectWalletConnect(walletUniversalLink?: string) { state.wcPromise = this._getClient().connectWalletConnect(uri => { state.wcUri = uri; state.wcPairingExpiry = CoreHelperUtil.getPairingExpiry(); ConnectorController.setConnectedConnector('WALLET_CONNECT'); StorageUtil.setConnectedConnector('WALLET_CONNECT'); - }); + }, walletUniversalLink); }, async connectExternal(options: ConnectExternalOptions) { diff --git a/packages/core/src/utils/CoreHelperUtil.ts b/packages/core/src/utils/CoreHelperUtil.ts index 9a9e72a3..707f7df7 100644 --- a/packages/core/src/utils/CoreHelperUtil.ts +++ b/packages/core/src/utils/CoreHelperUtil.ts @@ -73,7 +73,18 @@ export const CoreHelperUtil = { return url.startsWith('http://') || url.startsWith('https://'); }, + isLinkModeURL(url: string) { + return CoreHelperUtil.isHttpUrl(url) && url.includes('wc_ev'); + }, + formatNativeUrl(appUrl: string, wcUri: string): LinkingRecord { + if (CoreHelperUtil.isLinkModeURL(wcUri)) { + return { + redirect: wcUri, + href: wcUri + }; + } + if (CoreHelperUtil.isHttpUrl(appUrl)) { return this.formatUniversalUrl(appUrl, wcUri); } @@ -94,6 +105,13 @@ export const CoreHelperUtil = { }, formatUniversalUrl(appUrl: string, wcUri: string): LinkingRecord { + if (CoreHelperUtil.isLinkModeURL(wcUri)) { + return { + redirect: wcUri, + href: wcUri + }; + } + if (!CoreHelperUtil.isHttpUrl(appUrl)) { return this.formatNativeUrl(appUrl, wcUri); } @@ -110,7 +128,7 @@ export const CoreHelperUtil = { }, openLink(url: string) { - Linking.openURL(url); + return Linking.openURL(url); }, formatBalance(balance: string | undefined, symbol: string | undefined, decimals = 3) { diff --git a/packages/core/src/utils/TypeUtil.ts b/packages/core/src/utils/TypeUtil.ts index 5c714ee7..b40fcd2b 100644 --- a/packages/core/src/utils/TypeUtil.ts +++ b/packages/core/src/utils/TypeUtil.ts @@ -65,6 +65,7 @@ export interface WcWallet { mobile_link?: string | null; desktop_link?: string | null; webapp_link?: string | null; + link_mode?: string | null; app_store?: string | null; play_store?: string | null; } @@ -137,6 +138,7 @@ export type CustomWallet = Pick< | 'mobile_link' | 'desktop_link' | 'webapp_link' + | 'link_mode' | 'app_store' | 'play_store' >; diff --git a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx index 573aa226..a572bd4d 100644 --- a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx +++ b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx @@ -1,6 +1,6 @@ import { useSnapshot } from 'valtio'; import { useCallback, useEffect, useState } from 'react'; -import { Linking, Platform, ScrollView } from 'react-native'; +import { Platform, ScrollView } from 'react-native'; import { RouterController, ApiController, @@ -52,7 +52,7 @@ export function ConnectingMobile({ onRetry, onCopyUri, isInstalled }: Props) { const onStorePress = () => { if (storeUrl) { - Linking.openURL(storeUrl); + CoreHelperUtil.openLink(storeUrl); } }; @@ -66,7 +66,7 @@ export function ConnectingMobile({ onRetry, onCopyUri, isInstalled }: Props) { const wcLinking = { name, href }; ConnectionController.setWcLinking(wcLinking); ConnectionController.setPressedWallet(data?.wallet); - await Linking.openURL(redirect); + await CoreHelperUtil.openLink(redirect); await ConnectionController.state.wcPromise; UiUtil.storeConnectedWallet(wcLinking, data?.wallet); diff --git a/packages/scaffold/src/views/w3m-connecting-view/index.tsx b/packages/scaffold/src/views/w3m-connecting-view/index.tsx index 302ce2b5..58955a07 100644 --- a/packages/scaffold/src/views/w3m-connecting-view/index.tsx +++ b/packages/scaffold/src/views/w3m-connecting-view/index.tsx @@ -33,8 +33,9 @@ export function ConnectingView() { const initializeConnection = async (retry = false) => { try { const { wcPairingExpiry } = ConnectionController.state; + const { data: routeData } = RouterController.state; if (retry || CoreHelperUtil.isPairingExpired(wcPairingExpiry)) { - ConnectionController.connectWalletConnect(); + ConnectionController.connectWalletConnect(routeData?.wallet?.link_mode ?? undefined); await ConnectionController.state.wcPromise; AccountController.setIsConnected(true); diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts index 4b3e7b30..20bc9f9d 100644 --- a/packages/wagmi/src/client.ts +++ b/packages/wagmi/src/client.ts @@ -108,7 +108,7 @@ export class Web3Modal extends Web3ModalScaffold { }; const connectionControllerClient: ConnectionControllerClient = { - connectWalletConnect: async onUri => { + connectWalletConnect: async (onUri, walletUniversalLink) => { const connector = wagmiConfig.connectors.find( c => c.id === ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID ); @@ -142,12 +142,14 @@ export class Web3Modal extends Web3ModalScaffold { ); // @ts-expect-error - setting requested chains beforehand avoids wagmi auto disconnecting the session when `connect` is called because it things chains are stale await connector.setRequestedChainsIds(siweParams.chains); - - const result = await provider.authenticate({ - nonce: await siweConfig.getNonce(), - methods: [...OPTIONAL_METHODS], - ...siweParams - }); + const result = await provider.authenticate( + { + nonce: await siweConfig.getNonce(), + methods: [...OPTIONAL_METHODS], + ...siweParams + }, + walletUniversalLink + ); // Auths is an array of signed CACAO objects https://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-74.md const signedCacao = result?.auths?.[0]; From f2b3aa210b5bbfb17742c8d29c04ee05efb22939 Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Mon, 22 Jul 2024 11:39:34 -0300 Subject: [PATCH 02/10] chore: added redirect in optionscontroller metadata --- packages/core/src/utils/TypeUtil.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/core/src/utils/TypeUtil.ts b/packages/core/src/utils/TypeUtil.ts index b40fcd2b..a0db1118 100644 --- a/packages/core/src/utils/TypeUtil.ts +++ b/packages/core/src/utils/TypeUtil.ts @@ -127,6 +127,11 @@ export type Metadata = { description: string; url: string; icons: string[]; + redirect?: { + native?: string; + universal?: string; + linkMode?: boolean; + }; }; export type CustomWallet = Pick< From 066dd628e19e86e5ab8432a7e563b849fef21e9f Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Fri, 16 Aug 2024 09:24:16 -0300 Subject: [PATCH 03/10] chore: bump link mode canary --- package.json | 7 + yarn.lock | 373 +++++++++------------------------------------------ 2 files changed, 70 insertions(+), 310 deletions(-) diff --git a/package.json b/package.json index 3c7a849a..a956ccb2 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,13 @@ "changeset:version": "changeset version; yarn run version:update", "version:update": "./scripts/bump-version.sh" }, + "resolutions": { + "@walletconnect/react-native-compat": "2.15.0-canary-lm.0", + "@walletconnect/ethereum-provider": "2.15.0-canary-lm.0", + "@walletconnect/sign-client": "2.15.0-canary-lm.0", + "@walletconnect/core": "2.15.0-canary-lm.0", + "@walletconnect/utils": "2.15.0-canary-lm.0" + }, "devDependencies": { "@changesets/changelog-github": "0.5.0", "@changesets/cli": "2.27.7", diff --git a/yarn.lock b/yarn.lock index 8a45a53c..2002dce7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10088,34 +10088,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/core@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/core@npm:2.13.0" - dependencies: - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" - "@walletconnect/keyvaluestorage": "npm:1.1.1" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/relay-api": "npm:1.0.10" - "@walletconnect/relay-auth": "npm:1.0.4" - "@walletconnect/safe-json": "npm:1.0.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.0" - "@walletconnect/utils": "npm:2.13.0" - events: "npm:3.3.0" - isomorphic-unfetch: "npm:3.1.0" - lodash.isequal: "npm:4.5.0" - uint8arrays: "npm:3.1.0" - checksum: e1356eb8ac94f8f6743814337607244557280d43a6e2ec14591beb21dca0e73cc79b16f0a2ace60ef447149778c5383a1fd4eac67788372d249c8c5f6d8c7dc2 - languageName: node - linkType: hard - -"@walletconnect/core@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/core@npm:2.13.1" +"@walletconnect/core@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/core@npm:2.15.0-canary-lm.0" dependencies: "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-provider": "npm:1.0.14" @@ -10124,42 +10099,16 @@ __metadata: "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" "@walletconnect/keyvaluestorage": "npm:1.1.1" "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/relay-api": "npm:1.0.11" "@walletconnect/relay-auth": "npm:1.0.4" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.1" - "@walletconnect/utils": "npm:2.13.1" + "@walletconnect/types": "npm:2.15.0-canary-lm.0" + "@walletconnect/utils": "npm:2.15.0-canary-lm.0" events: "npm:3.3.0" - isomorphic-unfetch: "npm:3.1.0" lodash.isequal: "npm:4.5.0" uint8arrays: "npm:3.1.0" - checksum: 0295d3b7aede7244f3ea97c04055407421c6b7bb24535ec88af425456f8d9844eb79643478b6bf40b85d1277a3ddf2743edfd2ee058c3194c2c2dd391d6d75c3 - languageName: node - linkType: hard - -"@walletconnect/core@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/core@npm:2.14.0" - dependencies: - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" - "@walletconnect/keyvaluestorage": "npm:1.1.1" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/relay-api": "npm:1.0.10" - "@walletconnect/relay-auth": "npm:1.0.4" - "@walletconnect/safe-json": "npm:1.0.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.14.0" - "@walletconnect/utils": "npm:2.14.0" - events: "npm:3.3.0" - isomorphic-unfetch: "npm:3.1.0" - lodash.isequal: "npm:4.5.0" - uint8arrays: "npm:3.1.0" - checksum: 4b9ccec319f893d65acaa9c1641408783f1fddd2fe054540cf1cdd8a3a5adc1151cfbd338a67f342f10649ae48a621d8d6788111122899560b60a1e664fc16a8 + checksum: 33f2f6158c9fceecdbc2bed27ae1e91b23fa8ffcd66fb393d0224da73caaa03ec9e6ace9ae91c219f66728fa7be2d78dd2d0d0e8b9e43a05308c54e1c76cae4e languageName: node linkType: hard @@ -10172,57 +10121,21 @@ __metadata: languageName: node linkType: hard -"@walletconnect/ethereum-provider@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/ethereum-provider@npm:2.13.0" +"@walletconnect/ethereum-provider@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/ethereum-provider@npm:2.15.0-canary-lm.0" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/modal": "npm:2.6.2" - "@walletconnect/sign-client": "npm:2.13.0" - "@walletconnect/types": "npm:2.13.0" - "@walletconnect/universal-provider": "npm:2.13.0" - "@walletconnect/utils": "npm:2.13.0" + "@walletconnect/sign-client": "npm:2.15.0-canary-lm.0" + "@walletconnect/types": "npm:2.15.0-canary-lm.0" + "@walletconnect/universal-provider": "npm:2.15.0-canary-lm.0" + "@walletconnect/utils": "npm:2.15.0-canary-lm.0" events: "npm:3.3.0" - checksum: 4bc3c76b7a9e81ac505fcff99244bfa9f14419ee2de322e491dacd94669923adf5e9e1a2298ae84b33e3d5985a0bfab6b7715237e6f2ce23ec02c67dedb58898 - languageName: node - linkType: hard - -"@walletconnect/ethereum-provider@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/ethereum-provider@npm:2.13.1" - dependencies: - "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/modal": "npm:2.6.2" - "@walletconnect/sign-client": "npm:2.13.1" - "@walletconnect/types": "npm:2.13.1" - "@walletconnect/universal-provider": "npm:2.13.1" - "@walletconnect/utils": "npm:2.13.1" - events: "npm:3.3.0" - checksum: 6d6fe593641a87a659be59ce7430b7e0b0860f21ffcf57428239ffe7a77168b7b861ec7ef7eab7b45a004c11782fc26e6400d3e3b1892607019cb825a119ca97 - languageName: node - linkType: hard - -"@walletconnect/ethereum-provider@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/ethereum-provider@npm:2.14.0" - dependencies: - "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/modal": "npm:2.6.2" - "@walletconnect/sign-client": "npm:2.14.0" - "@walletconnect/types": "npm:2.14.0" - "@walletconnect/universal-provider": "npm:2.14.0" - "@walletconnect/utils": "npm:2.14.0" - events: "npm:3.3.0" - checksum: 43fbd93be02e752904513ec4f88ae0c1d986ddc1d13344f8af8d48eec11450c583b65b9024f36c3c4432a92bfd2dd4f946ef092846b21334f850b56d05ab8cf2 + checksum: 8717dd6d8780ac2258d64cfd09bd8355ec63883fcf2c8bddbed709c56957fe4228f20002de7363bbee143806de6cdce1d04ad12c8d357592de440f7669ded005 languageName: node linkType: hard @@ -10370,28 +10283,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/react-native-compat@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/react-native-compat@npm:2.13.1" - dependencies: - events: "npm:3.3.0" - fast-text-encoding: "npm:1.0.6" - react-native-url-polyfill: "npm:2.0.0" - peerDependencies: - "@react-native-async-storage/async-storage": "*" - "@react-native-community/netinfo": "*" - expo-application: "*" - react-native-get-random-values: "*" - peerDependenciesMeta: - expo-application: - optional: true - checksum: 0eaa413109b7098a3a6c038f6424151c4e995946fc38f7b8c3bfc37fd917a6bac2df06f5f1f6259dadcdf32b6c6fd331f50d1baa89d484c719ce8c4506616b11 - languageName: node - linkType: hard - -"@walletconnect/react-native-compat@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/react-native-compat@npm:2.14.0" +"@walletconnect/react-native-compat@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/react-native-compat@npm:2.15.0-canary-lm.0" dependencies: events: "npm:3.3.0" fast-text-encoding: "npm:1.0.6" @@ -10404,16 +10298,16 @@ __metadata: peerDependenciesMeta: expo-application: optional: true - checksum: f0987bf90ebc99316a9182af995e953468b54ee7e6c4e3650b5794be750a1df8707011e185dfbe7e331950a0c0af09d4290c838dd5d4e4e45d6e29569a924487 + checksum: 3fa4b085d15538001054e6fc759c880b19446b96ca4de99fe723e376640f62a32b65e50484d46c800388d858b06957a3b644538ac03be926e74cc626bac273d5 languageName: node linkType: hard -"@walletconnect/relay-api@npm:1.0.10": - version: 1.0.10 - resolution: "@walletconnect/relay-api@npm:1.0.10" +"@walletconnect/relay-api@npm:1.0.11": + version: 1.0.11 + resolution: "@walletconnect/relay-api@npm:1.0.11" dependencies: "@walletconnect/jsonrpc-types": "npm:^1.0.2" - checksum: 2709bbe45f60579cd2e1c74b0fd03c36ea409cd8a9117e00a7485428d0c9ba7eb02e525c21e5286db2b6ce563b1d29053b0249c2ed95f8adcf02b11e54f61fcd + checksum: 2595d7e68d3a93e7735e0b6204811762898b0ce1466e811d78be5bcec7ac1cde5381637615a99104099165bf63695da5ef9381d6ded29924a57a71b10712a91d languageName: node linkType: hard @@ -10440,54 +10334,20 @@ __metadata: languageName: node linkType: hard -"@walletconnect/sign-client@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/sign-client@npm:2.13.0" - dependencies: - "@walletconnect/core": "npm:2.13.0" - "@walletconnect/events": "npm:1.0.1" - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.0" - "@walletconnect/utils": "npm:2.13.0" - events: "npm:3.3.0" - checksum: 58c702997f719cab9b183d23c53efee561a3a407de24e464e339e350124a71eeccb1bd651f0893ad0f39343ce42a7ff3666bbd28cb8dfc6a0e8d12c94eacc288 - languageName: node - linkType: hard - -"@walletconnect/sign-client@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/sign-client@npm:2.13.1" - dependencies: - "@walletconnect/core": "npm:2.13.1" - "@walletconnect/events": "npm:1.0.1" - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.1" - "@walletconnect/utils": "npm:2.13.1" - events: "npm:3.3.0" - checksum: 2b251d781c26c86b4a18cbccd00dd5182d4ef7094e41e089fae2d89306e463c3922786f9f49b849f190712540c20659cf5d00aa790c395dab8bc7810f009f7c1 - languageName: node - linkType: hard - -"@walletconnect/sign-client@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/sign-client@npm:2.14.0" +"@walletconnect/sign-client@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/sign-client@npm:2.15.0-canary-lm.0" dependencies: - "@walletconnect/core": "npm:2.14.0" + "@walletconnect/core": "npm:2.15.0-canary-lm.0" "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.14.0" - "@walletconnect/utils": "npm:2.14.0" + "@walletconnect/types": "npm:2.15.0-canary-lm.0" + "@walletconnect/utils": "npm:2.15.0-canary-lm.0" events: "npm:3.3.0" - checksum: 77ca995c46ed76fa7086df5b841c3e06a36b33b7f8323606c36567ee7ca4123bc3c64bf3f530f02a4bbc15261c080eea6f048c96ed35a1d7b8f1c7e5c92f82fc + checksum: dedc27acad2266664bdeecd2fdf160d675844220d149cdab75dc8e84236522b684265e2af3b04429539b97d7df2bd5cfcfa46727a998be829271036c7da17eb9 languageName: node linkType: hard @@ -10500,9 +10360,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/types@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/types@npm:2.13.0" +"@walletconnect/types@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/types@npm:2.15.0-canary-lm.0" dependencies: "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" @@ -10510,152 +10370,47 @@ __metadata: "@walletconnect/keyvaluestorage": "npm:1.1.1" "@walletconnect/logger": "npm:2.1.2" events: "npm:3.3.0" - checksum: 9962284daf92d6b27a009b90b908518b3f028f10f2168ddbc37ad2cb2b20cb0e65d170aa4343e2ea445c519cf79e78264480e2b2c4ab9f974f2c15962db5b012 - languageName: node - linkType: hard - -"@walletconnect/types@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/types@npm:2.13.1" - dependencies: - "@walletconnect/events": "npm:1.0.1" - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/keyvaluestorage": "npm:1.1.1" - "@walletconnect/logger": "npm:2.1.2" - events: "npm:3.3.0" - checksum: 79a45ec8f9d95a6ae4c52d13d52e68b7c6025a958d629db433d7be7e91d397a05305f62f40b735a6eba4ba3f649d82d7b6195d362e508940b1484ebc0c3ee295 - languageName: node - linkType: hard - -"@walletconnect/types@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/types@npm:2.14.0" - dependencies: - "@walletconnect/events": "npm:1.0.1" - "@walletconnect/heartbeat": "npm:1.2.2" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/keyvaluestorage": "npm:1.1.1" - "@walletconnect/logger": "npm:2.1.2" - events: "npm:3.3.0" - checksum: ea594c76b3dd3e9d75e8702c30e449a0af98423c76e5ad708bc41ad5624fd7725ba7329dd6f09f489eb5b08334387f39744457d3b173421517bd023c908da744 - languageName: node - linkType: hard - -"@walletconnect/universal-provider@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/universal-provider@npm:2.13.0" - dependencies: - "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/sign-client": "npm:2.13.0" - "@walletconnect/types": "npm:2.13.0" - "@walletconnect/utils": "npm:2.13.0" - events: "npm:3.3.0" - checksum: 79d14cdce74054859f26f69a17215c59367d961d0f36e7868601ed98030bd0636b3806dd68b76cc66ec4a70d5f6ec107fbe18bb6a1022a5161ea6d71810a0ed9 + checksum: 7b7816ca1ae2af93209e8dcc5c2ea344ae6a4fd4e24efe8bed20389d34744dba0ceb262686d9a64c5d558e636cd91fa1abfaae7b268e48ddaca89721ea3d2b14 languageName: node linkType: hard -"@walletconnect/universal-provider@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/universal-provider@npm:2.13.1" +"@walletconnect/universal-provider@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/universal-provider@npm:2.15.0-canary-lm.0" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/sign-client": "npm:2.13.1" - "@walletconnect/types": "npm:2.13.1" - "@walletconnect/utils": "npm:2.13.1" + "@walletconnect/sign-client": "npm:2.15.0-canary-lm.0" + "@walletconnect/types": "npm:2.15.0-canary-lm.0" + "@walletconnect/utils": "npm:2.15.0-canary-lm.0" events: "npm:3.3.0" - checksum: 432955839df2e803196fbc8d04b183051966977215455eed3bfba21958c7adb8f67989ef328b7ba7b9c99ab6ceea2cb75d338f446b8f5e363192087d479891e9 - languageName: node - linkType: hard - -"@walletconnect/universal-provider@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/universal-provider@npm:2.14.0" - dependencies: - "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" - "@walletconnect/jsonrpc-provider": "npm:1.0.14" - "@walletconnect/jsonrpc-types": "npm:1.0.4" - "@walletconnect/jsonrpc-utils": "npm:1.0.8" - "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/sign-client": "npm:2.14.0" - "@walletconnect/types": "npm:2.14.0" - "@walletconnect/utils": "npm:2.14.0" - events: "npm:3.3.0" - checksum: 22d7925272eac1efc4337e406b0d195fb90efed112c937e45cf03bbe950de080c2052ddd4ce869e67ccabd604a54d5cfc9cc2bf8f9777cef0387a62c1a109adb - languageName: node - linkType: hard - -"@walletconnect/utils@npm:2.13.0": - version: 2.13.0 - resolution: "@walletconnect/utils@npm:2.13.0" - dependencies: - "@stablelib/chacha20poly1305": "npm:1.0.1" - "@stablelib/hkdf": "npm:1.0.1" - "@stablelib/random": "npm:1.0.2" - "@stablelib/sha256": "npm:1.0.1" - "@stablelib/x25519": "npm:1.0.3" - "@walletconnect/relay-api": "npm:1.0.10" - "@walletconnect/safe-json": "npm:1.0.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.0" - "@walletconnect/window-getters": "npm:1.0.1" - "@walletconnect/window-metadata": "npm:1.0.1" - detect-browser: "npm:5.3.0" - query-string: "npm:7.1.3" - uint8arrays: "npm:3.1.0" - checksum: 2dbdb9ed790492411eb5c4e6b06aa511f6c0204c4ff283ecb5a4d339bb1bf3da033ef3a0c0af66b94df0553676f408222c2feca8c601b0554be2bbfbef43d6ec - languageName: node - linkType: hard - -"@walletconnect/utils@npm:2.13.1": - version: 2.13.1 - resolution: "@walletconnect/utils@npm:2.13.1" - dependencies: - "@stablelib/chacha20poly1305": "npm:1.0.1" - "@stablelib/hkdf": "npm:1.0.1" - "@stablelib/random": "npm:1.0.2" - "@stablelib/sha256": "npm:1.0.1" - "@stablelib/x25519": "npm:1.0.3" - "@walletconnect/relay-api": "npm:1.0.10" - "@walletconnect/safe-json": "npm:1.0.2" - "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.13.1" - "@walletconnect/window-getters": "npm:1.0.1" - "@walletconnect/window-metadata": "npm:1.0.1" - detect-browser: "npm:5.3.0" - query-string: "npm:7.1.3" - uint8arrays: "npm:3.1.0" - checksum: 8d7f0484a3d110aff0a615bcd99f61ebd23c09af36d20cc32f666a9bd59eef634259c2f29e06f5c175ae36a103761d81bcc6478fbe585b48a6511036b24542bb + checksum: c62e05544348732529385fe477e36dad77305c0f8eca1daf745f437cdb96932a6cce8f8991aeca26885e1113545b644a85749b137632ffbf0fa30e9973e59e49 languageName: node linkType: hard -"@walletconnect/utils@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/utils@npm:2.14.0" +"@walletconnect/utils@npm:2.15.0-canary-lm.0": + version: 2.15.0-canary-lm.0 + resolution: "@walletconnect/utils@npm:2.15.0-canary-lm.0" dependencies: "@stablelib/chacha20poly1305": "npm:1.0.1" "@stablelib/hkdf": "npm:1.0.1" "@stablelib/random": "npm:1.0.2" "@stablelib/sha256": "npm:1.0.1" "@stablelib/x25519": "npm:1.0.3" - "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/relay-api": "npm:1.0.11" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.14.0" + "@walletconnect/types": "npm:2.15.0-canary-lm.0" "@walletconnect/window-getters": "npm:1.0.1" "@walletconnect/window-metadata": "npm:1.0.1" detect-browser: "npm:5.3.0" + elliptic: "npm:^6.5.7" query-string: "npm:7.1.3" uint8arrays: "npm:3.1.0" - checksum: c7dc3155ac56c84edcf0c39fa61012675193f016698b0da941aba2977779398e95cddcf2ede139685856d84e39732d88417feb15d8a3844b00b13a9b3b68a149 + checksum: 81b20971151b0e40fa13b6dc99b8ed301975448e138588904f9c3565e27fe6350d86ddfc458b4282fa451eecb7b3b6421a75276b61ae63840e9097f3d6f39aa2 languageName: node linkType: hard @@ -14004,6 +13759,21 @@ __metadata: languageName: node linkType: hard +"elliptic@npm:^6.5.7": + version: 6.5.7 + resolution: "elliptic@npm:6.5.7" + dependencies: + bn.js: "npm:^4.11.9" + brorand: "npm:^1.1.0" + hash.js: "npm:^1.0.0" + hmac-drbg: "npm:^1.0.1" + inherits: "npm:^2.0.4" + minimalistic-assert: "npm:^1.0.1" + minimalistic-crypto-utils: "npm:^1.0.1" + checksum: 799959b6c54ea3564e8961f35abdf8c77e37617f3051614b05ab1fb6a04ddb65bd1caa75ed1bae375b15dda312a0f79fed26ebe76ecf05c5a7af244152a601b8 + languageName: node + linkType: hard + "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -17533,16 +17303,6 @@ __metadata: languageName: node linkType: hard -"isomorphic-unfetch@npm:3.1.0": - version: 3.1.0 - resolution: "isomorphic-unfetch@npm:3.1.0" - dependencies: - node-fetch: "npm:^2.6.1" - unfetch: "npm:^4.2.0" - checksum: d3b61fca06304db692b7f76bdfd3a00f410e42cfa7403c3b250546bf71589d18cf2f355922f57198e4cc4a9872d3647b20397a5c3edf1a347c90d57c83cf2a89 - languageName: node - linkType: hard - "isows@npm:1.0.3": version: 1.0.3 resolution: "isows@npm:1.0.3" @@ -24691,13 +24451,6 @@ __metadata: languageName: node linkType: hard -"unfetch@npm:^4.2.0": - version: 4.2.0 - resolution: "unfetch@npm:4.2.0" - checksum: a5c0a896a6f09f278b868075aea65652ad185db30e827cb7df45826fe5ab850124bf9c44c4dafca4bf0c55a0844b17031e8243467fcc38dd7a7d435007151f1b - languageName: node - linkType: hard - "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" From 57ddd3d7f75db965bbf685354b99e6084b922b5b Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:25:47 -0300 Subject: [PATCH 04/10] chore: hide copy button if uri is linkmode --- apps/native/src/utils/misc.ts | 5 ++--- packages/core/src/utils/CoreHelperUtil.ts | 6 +++++- .../scaffold/src/partials/w3m-connecting-mobile/index.tsx | 7 ++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/native/src/utils/misc.ts b/apps/native/src/utils/misc.ts index e76735d5..ef2f26a2 100644 --- a/apps/native/src/utils/misc.ts +++ b/apps/native/src/utils/misc.ts @@ -8,7 +8,7 @@ export const getCustomWallets = () => { image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', mobile_link: 'rn-web3wallet://', - link_mode: 'https://dev.lab.web3modal.com/walletkit_rn' + link_mode: 'https://lab.web3modal.com/rn_walletkit' }, { id: 'flutter-wallet', @@ -27,8 +27,7 @@ export const getCustomWallets = () => { image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', mobile_link: 'kotlin-web3wallet://', - link_mode: - 'https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet' + link_mode: 'https://lab.web3modal.com/wallet' }); } else if (Platform.OS === 'ios') { wallets.push({ diff --git a/packages/core/src/utils/CoreHelperUtil.ts b/packages/core/src/utils/CoreHelperUtil.ts index 2d5ccce3..f5f63f59 100644 --- a/packages/core/src/utils/CoreHelperUtil.ts +++ b/packages/core/src/utils/CoreHelperUtil.ts @@ -75,7 +75,11 @@ export const CoreHelperUtil = { return url.startsWith('http://') || url.startsWith('https://'); }, - isLinkModeURL(url: string) { + isLinkModeURL(url?: string) { + if (!url) { + return false; + } + return CoreHelperUtil.isHttpUrl(url) && url.includes('wc_ev'); }, diff --git a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx index 18240f80..02e59447 100644 --- a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx +++ b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx @@ -37,7 +37,11 @@ export function ConnectingMobile({ onRetry, onCopyUri, isInstalled }: Props) { const { maxWidth: width } = useCustomDimensions(); const { wcUri, wcError } = useSnapshot(ConnectionController.state); const [errorType, setErrorType] = useState(); - const showCopy = OptionsController.isClipboardAvailable() && errorType !== 'not_installed'; + const showCopy = + OptionsController.isClipboardAvailable() && + errorType !== 'not_installed' && + !CoreHelperUtil.isLinkModeURL(wcUri); + const showRetry = errorType !== 'not_installed'; const bodyMessage = getMessage({ walletName: data?.wallet?.name, errorType, declined: wcError }); @@ -128,6 +132,7 @@ export function ConnectingMobile({ onRetry, onCopyUri, isInstalled }: Props) { iconLeft="refresh" style={styles.retryButton} iconStyle={styles.retryIcon} + disabled={!wcUri} onPress={onRetryPress} > Try again From 3551343ec85bd25c3c8a034d617f6beff1f06242 Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:12:34 -0300 Subject: [PATCH 05/10] chore: removed resolutions --- apps/native/App.tsx | 3 +- package.json | 7 - yarn.lock | 373 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 312 insertions(+), 71 deletions(-) diff --git a/apps/native/App.tsx b/apps/native/App.tsx index c669f359..7bccef84 100644 --- a/apps/native/App.tsx +++ b/apps/native/App.tsx @@ -47,7 +47,8 @@ const emailConn = emailConnector({ projectId, metadata }); const wagmiConfig = defaultWagmiConfig({ chains, projectId, - metadata + metadata, + extraConnectors: [emailConn] }); const queryClient = new QueryClient(); diff --git a/package.json b/package.json index a956ccb2..3c7a849a 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,6 @@ "changeset:version": "changeset version; yarn run version:update", "version:update": "./scripts/bump-version.sh" }, - "resolutions": { - "@walletconnect/react-native-compat": "2.15.0-canary-lm.0", - "@walletconnect/ethereum-provider": "2.15.0-canary-lm.0", - "@walletconnect/sign-client": "2.15.0-canary-lm.0", - "@walletconnect/core": "2.15.0-canary-lm.0", - "@walletconnect/utils": "2.15.0-canary-lm.0" - }, "devDependencies": { "@changesets/changelog-github": "0.5.0", "@changesets/cli": "2.27.7", diff --git a/yarn.lock b/yarn.lock index 2002dce7..8a45a53c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10088,9 +10088,34 @@ __metadata: languageName: node linkType: hard -"@walletconnect/core@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/core@npm:2.15.0-canary-lm.0" +"@walletconnect/core@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/core@npm:2.13.0" + dependencies: + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/relay-auth": "npm:1.0.4" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.13.0" + "@walletconnect/utils": "npm:2.13.0" + events: "npm:3.3.0" + isomorphic-unfetch: "npm:3.1.0" + lodash.isequal: "npm:4.5.0" + uint8arrays: "npm:3.1.0" + checksum: e1356eb8ac94f8f6743814337607244557280d43a6e2ec14591beb21dca0e73cc79b16f0a2ace60ef447149778c5383a1fd4eac67788372d249c8c5f6d8c7dc2 + languageName: node + linkType: hard + +"@walletconnect/core@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/core@npm:2.13.1" dependencies: "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-provider": "npm:1.0.14" @@ -10099,16 +10124,42 @@ __metadata: "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" "@walletconnect/keyvaluestorage": "npm:1.1.1" "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/relay-api": "npm:1.0.11" + "@walletconnect/relay-api": "npm:1.0.10" "@walletconnect/relay-auth": "npm:1.0.4" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.0-canary-lm.0" - "@walletconnect/utils": "npm:2.15.0-canary-lm.0" + "@walletconnect/types": "npm:2.13.1" + "@walletconnect/utils": "npm:2.13.1" events: "npm:3.3.0" + isomorphic-unfetch: "npm:3.1.0" lodash.isequal: "npm:4.5.0" uint8arrays: "npm:3.1.0" - checksum: 33f2f6158c9fceecdbc2bed27ae1e91b23fa8ffcd66fb393d0224da73caaa03ec9e6ace9ae91c219f66728fa7be2d78dd2d0d0e8b9e43a05308c54e1c76cae4e + checksum: 0295d3b7aede7244f3ea97c04055407421c6b7bb24535ec88af425456f8d9844eb79643478b6bf40b85d1277a3ddf2743edfd2ee058c3194c2c2dd391d6d75c3 + languageName: node + linkType: hard + +"@walletconnect/core@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/core@npm:2.14.0" + dependencies: + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/jsonrpc-ws-connection": "npm:1.0.14" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/relay-auth": "npm:1.0.4" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.14.0" + "@walletconnect/utils": "npm:2.14.0" + events: "npm:3.3.0" + isomorphic-unfetch: "npm:3.1.0" + lodash.isequal: "npm:4.5.0" + uint8arrays: "npm:3.1.0" + checksum: 4b9ccec319f893d65acaa9c1641408783f1fddd2fe054540cf1cdd8a3a5adc1151cfbd338a67f342f10649ae48a621d8d6788111122899560b60a1e664fc16a8 languageName: node linkType: hard @@ -10121,21 +10172,57 @@ __metadata: languageName: node linkType: hard -"@walletconnect/ethereum-provider@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/ethereum-provider@npm:2.15.0-canary-lm.0" +"@walletconnect/ethereum-provider@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/ethereum-provider@npm:2.13.0" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/modal": "npm:2.6.2" - "@walletconnect/sign-client": "npm:2.15.0-canary-lm.0" - "@walletconnect/types": "npm:2.15.0-canary-lm.0" - "@walletconnect/universal-provider": "npm:2.15.0-canary-lm.0" - "@walletconnect/utils": "npm:2.15.0-canary-lm.0" + "@walletconnect/sign-client": "npm:2.13.0" + "@walletconnect/types": "npm:2.13.0" + "@walletconnect/universal-provider": "npm:2.13.0" + "@walletconnect/utils": "npm:2.13.0" events: "npm:3.3.0" - checksum: 8717dd6d8780ac2258d64cfd09bd8355ec63883fcf2c8bddbed709c56957fe4228f20002de7363bbee143806de6cdce1d04ad12c8d357592de440f7669ded005 + checksum: 4bc3c76b7a9e81ac505fcff99244bfa9f14419ee2de322e491dacd94669923adf5e9e1a2298ae84b33e3d5985a0bfab6b7715237e6f2ce23ec02c67dedb58898 + languageName: node + linkType: hard + +"@walletconnect/ethereum-provider@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/ethereum-provider@npm:2.13.1" + dependencies: + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/modal": "npm:2.6.2" + "@walletconnect/sign-client": "npm:2.13.1" + "@walletconnect/types": "npm:2.13.1" + "@walletconnect/universal-provider": "npm:2.13.1" + "@walletconnect/utils": "npm:2.13.1" + events: "npm:3.3.0" + checksum: 6d6fe593641a87a659be59ce7430b7e0b0860f21ffcf57428239ffe7a77168b7b861ec7ef7eab7b45a004c11782fc26e6400d3e3b1892607019cb825a119ca97 + languageName: node + linkType: hard + +"@walletconnect/ethereum-provider@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/ethereum-provider@npm:2.14.0" + dependencies: + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/modal": "npm:2.6.2" + "@walletconnect/sign-client": "npm:2.14.0" + "@walletconnect/types": "npm:2.14.0" + "@walletconnect/universal-provider": "npm:2.14.0" + "@walletconnect/utils": "npm:2.14.0" + events: "npm:3.3.0" + checksum: 43fbd93be02e752904513ec4f88ae0c1d986ddc1d13344f8af8d48eec11450c583b65b9024f36c3c4432a92bfd2dd4f946ef092846b21334f850b56d05ab8cf2 languageName: node linkType: hard @@ -10283,9 +10370,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/react-native-compat@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/react-native-compat@npm:2.15.0-canary-lm.0" +"@walletconnect/react-native-compat@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/react-native-compat@npm:2.13.1" dependencies: events: "npm:3.3.0" fast-text-encoding: "npm:1.0.6" @@ -10298,16 +10385,35 @@ __metadata: peerDependenciesMeta: expo-application: optional: true - checksum: 3fa4b085d15538001054e6fc759c880b19446b96ca4de99fe723e376640f62a32b65e50484d46c800388d858b06957a3b644538ac03be926e74cc626bac273d5 + checksum: 0eaa413109b7098a3a6c038f6424151c4e995946fc38f7b8c3bfc37fd917a6bac2df06f5f1f6259dadcdf32b6c6fd331f50d1baa89d484c719ce8c4506616b11 languageName: node linkType: hard -"@walletconnect/relay-api@npm:1.0.11": - version: 1.0.11 - resolution: "@walletconnect/relay-api@npm:1.0.11" +"@walletconnect/react-native-compat@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/react-native-compat@npm:2.14.0" + dependencies: + events: "npm:3.3.0" + fast-text-encoding: "npm:1.0.6" + react-native-url-polyfill: "npm:2.0.0" + peerDependencies: + "@react-native-async-storage/async-storage": "*" + "@react-native-community/netinfo": "*" + expo-application: "*" + react-native-get-random-values: "*" + peerDependenciesMeta: + expo-application: + optional: true + checksum: f0987bf90ebc99316a9182af995e953468b54ee7e6c4e3650b5794be750a1df8707011e185dfbe7e331950a0c0af09d4290c838dd5d4e4e45d6e29569a924487 + languageName: node + linkType: hard + +"@walletconnect/relay-api@npm:1.0.10": + version: 1.0.10 + resolution: "@walletconnect/relay-api@npm:1.0.10" dependencies: "@walletconnect/jsonrpc-types": "npm:^1.0.2" - checksum: 2595d7e68d3a93e7735e0b6204811762898b0ce1466e811d78be5bcec7ac1cde5381637615a99104099165bf63695da5ef9381d6ded29924a57a71b10712a91d + checksum: 2709bbe45f60579cd2e1c74b0fd03c36ea409cd8a9117e00a7485428d0c9ba7eb02e525c21e5286db2b6ce563b1d29053b0249c2ed95f8adcf02b11e54f61fcd languageName: node linkType: hard @@ -10334,20 +10440,54 @@ __metadata: languageName: node linkType: hard -"@walletconnect/sign-client@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/sign-client@npm:2.15.0-canary-lm.0" +"@walletconnect/sign-client@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/sign-client@npm:2.13.0" + dependencies: + "@walletconnect/core": "npm:2.13.0" + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.13.0" + "@walletconnect/utils": "npm:2.13.0" + events: "npm:3.3.0" + checksum: 58c702997f719cab9b183d23c53efee561a3a407de24e464e339e350124a71eeccb1bd651f0893ad0f39343ce42a7ff3666bbd28cb8dfc6a0e8d12c94eacc288 + languageName: node + linkType: hard + +"@walletconnect/sign-client@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/sign-client@npm:2.13.1" + dependencies: + "@walletconnect/core": "npm:2.13.1" + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.13.1" + "@walletconnect/utils": "npm:2.13.1" + events: "npm:3.3.0" + checksum: 2b251d781c26c86b4a18cbccd00dd5182d4ef7094e41e089fae2d89306e463c3922786f9f49b849f190712540c20659cf5d00aa790c395dab8bc7810f009f7c1 + languageName: node + linkType: hard + +"@walletconnect/sign-client@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/sign-client@npm:2.14.0" dependencies: - "@walletconnect/core": "npm:2.15.0-canary-lm.0" + "@walletconnect/core": "npm:2.14.0" "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.0-canary-lm.0" - "@walletconnect/utils": "npm:2.15.0-canary-lm.0" + "@walletconnect/types": "npm:2.14.0" + "@walletconnect/utils": "npm:2.14.0" events: "npm:3.3.0" - checksum: dedc27acad2266664bdeecd2fdf160d675844220d149cdab75dc8e84236522b684265e2af3b04429539b97d7df2bd5cfcfa46727a998be829271036c7da17eb9 + checksum: 77ca995c46ed76fa7086df5b841c3e06a36b33b7f8323606c36567ee7ca4123bc3c64bf3f530f02a4bbc15261c080eea6f048c96ed35a1d7b8f1c7e5c92f82fc languageName: node linkType: hard @@ -10360,9 +10500,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/types@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/types@npm:2.15.0-canary-lm.0" +"@walletconnect/types@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/types@npm:2.13.0" dependencies: "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" @@ -10370,47 +10510,152 @@ __metadata: "@walletconnect/keyvaluestorage": "npm:1.1.1" "@walletconnect/logger": "npm:2.1.2" events: "npm:3.3.0" - checksum: 7b7816ca1ae2af93209e8dcc5c2ea344ae6a4fd4e24efe8bed20389d34744dba0ceb262686d9a64c5d558e636cd91fa1abfaae7b268e48ddaca89721ea3d2b14 + checksum: 9962284daf92d6b27a009b90b908518b3f028f10f2168ddbc37ad2cb2b20cb0e65d170aa4343e2ea445c519cf79e78264480e2b2c4ab9f974f2c15962db5b012 + languageName: node + linkType: hard + +"@walletconnect/types@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/types@npm:2.13.1" + dependencies: + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + events: "npm:3.3.0" + checksum: 79a45ec8f9d95a6ae4c52d13d52e68b7c6025a958d629db433d7be7e91d397a05305f62f40b735a6eba4ba3f649d82d7b6195d362e508940b1484ebc0c3ee295 + languageName: node + linkType: hard + +"@walletconnect/types@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/types@npm:2.14.0" + dependencies: + "@walletconnect/events": "npm:1.0.1" + "@walletconnect/heartbeat": "npm:1.2.2" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/keyvaluestorage": "npm:1.1.1" + "@walletconnect/logger": "npm:2.1.2" + events: "npm:3.3.0" + checksum: ea594c76b3dd3e9d75e8702c30e449a0af98423c76e5ad708bc41ad5624fd7725ba7329dd6f09f489eb5b08334387f39744457d3b173421517bd023c908da744 + languageName: node + linkType: hard + +"@walletconnect/universal-provider@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/universal-provider@npm:2.13.0" + dependencies: + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/sign-client": "npm:2.13.0" + "@walletconnect/types": "npm:2.13.0" + "@walletconnect/utils": "npm:2.13.0" + events: "npm:3.3.0" + checksum: 79d14cdce74054859f26f69a17215c59367d961d0f36e7868601ed98030bd0636b3806dd68b76cc66ec4a70d5f6ec107fbe18bb6a1022a5161ea6d71810a0ed9 languageName: node linkType: hard -"@walletconnect/universal-provider@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/universal-provider@npm:2.15.0-canary-lm.0" +"@walletconnect/universal-provider@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/universal-provider@npm:2.13.1" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/sign-client": "npm:2.15.0-canary-lm.0" - "@walletconnect/types": "npm:2.15.0-canary-lm.0" - "@walletconnect/utils": "npm:2.15.0-canary-lm.0" + "@walletconnect/sign-client": "npm:2.13.1" + "@walletconnect/types": "npm:2.13.1" + "@walletconnect/utils": "npm:2.13.1" events: "npm:3.3.0" - checksum: c62e05544348732529385fe477e36dad77305c0f8eca1daf745f437cdb96932a6cce8f8991aeca26885e1113545b644a85749b137632ffbf0fa30e9973e59e49 + checksum: 432955839df2e803196fbc8d04b183051966977215455eed3bfba21958c7adb8f67989ef328b7ba7b9c99ab6ceea2cb75d338f446b8f5e363192087d479891e9 + languageName: node + linkType: hard + +"@walletconnect/universal-provider@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/universal-provider@npm:2.14.0" + dependencies: + "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" + "@walletconnect/jsonrpc-provider": "npm:1.0.14" + "@walletconnect/jsonrpc-types": "npm:1.0.4" + "@walletconnect/jsonrpc-utils": "npm:1.0.8" + "@walletconnect/logger": "npm:2.1.2" + "@walletconnect/sign-client": "npm:2.14.0" + "@walletconnect/types": "npm:2.14.0" + "@walletconnect/utils": "npm:2.14.0" + events: "npm:3.3.0" + checksum: 22d7925272eac1efc4337e406b0d195fb90efed112c937e45cf03bbe950de080c2052ddd4ce869e67ccabd604a54d5cfc9cc2bf8f9777cef0387a62c1a109adb + languageName: node + linkType: hard + +"@walletconnect/utils@npm:2.13.0": + version: 2.13.0 + resolution: "@walletconnect/utils@npm:2.13.0" + dependencies: + "@stablelib/chacha20poly1305": "npm:1.0.1" + "@stablelib/hkdf": "npm:1.0.1" + "@stablelib/random": "npm:1.0.2" + "@stablelib/sha256": "npm:1.0.1" + "@stablelib/x25519": "npm:1.0.3" + "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.13.0" + "@walletconnect/window-getters": "npm:1.0.1" + "@walletconnect/window-metadata": "npm:1.0.1" + detect-browser: "npm:5.3.0" + query-string: "npm:7.1.3" + uint8arrays: "npm:3.1.0" + checksum: 2dbdb9ed790492411eb5c4e6b06aa511f6c0204c4ff283ecb5a4d339bb1bf3da033ef3a0c0af66b94df0553676f408222c2feca8c601b0554be2bbfbef43d6ec + languageName: node + linkType: hard + +"@walletconnect/utils@npm:2.13.1": + version: 2.13.1 + resolution: "@walletconnect/utils@npm:2.13.1" + dependencies: + "@stablelib/chacha20poly1305": "npm:1.0.1" + "@stablelib/hkdf": "npm:1.0.1" + "@stablelib/random": "npm:1.0.2" + "@stablelib/sha256": "npm:1.0.1" + "@stablelib/x25519": "npm:1.0.3" + "@walletconnect/relay-api": "npm:1.0.10" + "@walletconnect/safe-json": "npm:1.0.2" + "@walletconnect/time": "npm:1.0.2" + "@walletconnect/types": "npm:2.13.1" + "@walletconnect/window-getters": "npm:1.0.1" + "@walletconnect/window-metadata": "npm:1.0.1" + detect-browser: "npm:5.3.0" + query-string: "npm:7.1.3" + uint8arrays: "npm:3.1.0" + checksum: 8d7f0484a3d110aff0a615bcd99f61ebd23c09af36d20cc32f666a9bd59eef634259c2f29e06f5c175ae36a103761d81bcc6478fbe585b48a6511036b24542bb languageName: node linkType: hard -"@walletconnect/utils@npm:2.15.0-canary-lm.0": - version: 2.15.0-canary-lm.0 - resolution: "@walletconnect/utils@npm:2.15.0-canary-lm.0" +"@walletconnect/utils@npm:2.14.0": + version: 2.14.0 + resolution: "@walletconnect/utils@npm:2.14.0" dependencies: "@stablelib/chacha20poly1305": "npm:1.0.1" "@stablelib/hkdf": "npm:1.0.1" "@stablelib/random": "npm:1.0.2" "@stablelib/sha256": "npm:1.0.1" "@stablelib/x25519": "npm:1.0.3" - "@walletconnect/relay-api": "npm:1.0.11" + "@walletconnect/relay-api": "npm:1.0.10" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.0-canary-lm.0" + "@walletconnect/types": "npm:2.14.0" "@walletconnect/window-getters": "npm:1.0.1" "@walletconnect/window-metadata": "npm:1.0.1" detect-browser: "npm:5.3.0" - elliptic: "npm:^6.5.7" query-string: "npm:7.1.3" uint8arrays: "npm:3.1.0" - checksum: 81b20971151b0e40fa13b6dc99b8ed301975448e138588904f9c3565e27fe6350d86ddfc458b4282fa451eecb7b3b6421a75276b61ae63840e9097f3d6f39aa2 + checksum: c7dc3155ac56c84edcf0c39fa61012675193f016698b0da941aba2977779398e95cddcf2ede139685856d84e39732d88417feb15d8a3844b00b13a9b3b68a149 languageName: node linkType: hard @@ -13759,21 +14004,6 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:^6.5.7": - version: 6.5.7 - resolution: "elliptic@npm:6.5.7" - dependencies: - bn.js: "npm:^4.11.9" - brorand: "npm:^1.1.0" - hash.js: "npm:^1.0.0" - hmac-drbg: "npm:^1.0.1" - inherits: "npm:^2.0.4" - minimalistic-assert: "npm:^1.0.1" - minimalistic-crypto-utils: "npm:^1.0.1" - checksum: 799959b6c54ea3564e8961f35abdf8c77e37617f3051614b05ab1fb6a04ddb65bd1caa75ed1bae375b15dda312a0f79fed26ebe76ecf05c5a7af244152a601b8 - languageName: node - linkType: hard - "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -17303,6 +17533,16 @@ __metadata: languageName: node linkType: hard +"isomorphic-unfetch@npm:3.1.0": + version: 3.1.0 + resolution: "isomorphic-unfetch@npm:3.1.0" + dependencies: + node-fetch: "npm:^2.6.1" + unfetch: "npm:^4.2.0" + checksum: d3b61fca06304db692b7f76bdfd3a00f410e42cfa7403c3b250546bf71589d18cf2f355922f57198e4cc4a9872d3647b20397a5c3edf1a347c90d57c83cf2a89 + languageName: node + linkType: hard + "isows@npm:1.0.3": version: 1.0.3 resolution: "isows@npm:1.0.3" @@ -24451,6 +24691,13 @@ __metadata: languageName: node linkType: hard +"unfetch@npm:^4.2.0": + version: 4.2.0 + resolution: "unfetch@npm:4.2.0" + checksum: a5c0a896a6f09f278b868075aea65652ad185db30e827cb7df45826fe5ab850124bf9c44c4dafca4bf0c55a0844b17031e8243467fcc38dd7a7d435007151f1b + languageName: node + linkType: hard + "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" From ec89280f97a66801957ca6ddeba435d4de5142bf Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:27:57 -0300 Subject: [PATCH 06/10] chore: removed disabled condition from retry button --- packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx index 02e59447..cc125867 100644 --- a/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx +++ b/packages/scaffold/src/partials/w3m-connecting-mobile/index.tsx @@ -132,7 +132,6 @@ export function ConnectingMobile({ onRetry, onCopyUri, isInstalled }: Props) { iconLeft="refresh" style={styles.retryButton} iconStyle={styles.retryIcon} - disabled={!wcUri} onPress={onRetryPress} > Try again From 6c51354216cfd7962454ba31aa2ef25400c56013 Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:57:12 -0300 Subject: [PATCH 07/10] chore: changes in sample app --- apps/native/App.tsx | 2 +- apps/native/src/utils/misc.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/native/App.tsx b/apps/native/App.tsx index 7bccef84..1aee37fe 100644 --- a/apps/native/App.tsx +++ b/apps/native/App.tsx @@ -31,7 +31,7 @@ const metadata = { icons: ['https://avatars.githubusercontent.com/u/37784886'], redirect: { native: 'redirect://', - universal: 'https://lab.web3modal.com/appkit_rn', + universal: 'https://lab.web3modal.com/rn_appkit', linkMode: true } }; diff --git a/apps/native/src/utils/misc.ts b/apps/native/src/utils/misc.ts index ef2f26a2..d9cf4b2c 100644 --- a/apps/native/src/utils/misc.ts +++ b/apps/native/src/utils/misc.ts @@ -16,7 +16,7 @@ export const getCustomWallets = () => { image_url: 'https://docs.walletconnect.com/assets/images/web3walletLogo-54d3b546146931ceaf47a3500868a73a.png', mobile_link: 'wcflutterwallet://', - link_mode: undefined + link_mode: 'https://lab.web3modal.com/flutter_walletkit' } ]; From 260e177c31e38dfdf0b5994974f409092229ca49 Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Wed, 4 Sep 2024 12:27:17 -0300 Subject: [PATCH 08/10] chore: changeset file --- .changeset/loud-countries-care.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .changeset/loud-countries-care.md diff --git a/.changeset/loud-countries-care.md b/.changeset/loud-countries-care.md new file mode 100644 index 00000000..4ceac3a1 --- /dev/null +++ b/.changeset/loud-countries-care.md @@ -0,0 +1,18 @@ +--- +'@web3modal/scaffold-react-native': minor +'@web3modal/ethers5-react-native': minor +'@web3modal/ethers-react-native': minor +'@web3modal/wagmi-react-native': minor +'@web3modal/core-react-native': minor +'@web3modal/coinbase-ethers-react-native': minor +'@web3modal/coinbase-wagmi-react-native': minor +'@web3modal/common-react-native': minor +'@web3modal/email-react-native': minor +'@web3modal/email-ethers-react-native': minor +'@web3modal/email-wagmi-react-native': minor +'@web3modal/scaffold-utils-react-native': minor +'@web3modal/siwe-react-native': minor +'@web3modal/ui-react-native': minor +--- + +feat: added link-mode support From 0dcb3fd8c325a014fbd360dbe8c6a404071e7d9f Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:24:23 -0300 Subject: [PATCH 09/10] chore: bump core deps in ethers --- packages/ethers/package.json | 2 +- packages/ethers5/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ethers/package.json b/packages/ethers/package.json index 6ec5a089..57208d8b 100644 --- a/packages/ethers/package.json +++ b/packages/ethers/package.json @@ -39,7 +39,7 @@ "access": "public" }, "dependencies": { - "@walletconnect/ethereum-provider": "2.15.3", + "@walletconnect/ethereum-provider": "2.16.0", "@web3modal/common-react-native": "2.0.4", "@web3modal/scaffold-react-native": "2.0.4", "@web3modal/scaffold-utils-react-native": "2.0.4", diff --git a/packages/ethers5/package.json b/packages/ethers5/package.json index bd06e689..6afb4841 100644 --- a/packages/ethers5/package.json +++ b/packages/ethers5/package.json @@ -39,7 +39,7 @@ "access": "public" }, "dependencies": { - "@walletconnect/ethereum-provider": "2.15.3", + "@walletconnect/ethereum-provider": "2.16.0", "@web3modal/common-react-native": "2.0.4", "@web3modal/scaffold-react-native": "2.0.4", "@web3modal/scaffold-utils-react-native": "2.0.4", From a2b441117bf491f699a662117c47b9a480a935b4 Mon Sep 17 00:00:00 2001 From: ignaciosantise <25931366+ignaciosantise@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:24:35 -0300 Subject: [PATCH 10/10] chore: bump deps --- package.json | 6 ++-- yarn.lock | 88 ++++++++++++++++++++++++++-------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 7f768934..29e52f02 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@types/jest": "29.5.7", "@types/qrcode": "1.5.5", "@types/react": "^18.2.6", - "@walletconnect/react-native-compat": "2.14.0", + "@walletconnect/react-native-compat": "2.16.0", "babel-jest": "^29.7.0", "eslint": "^8.46.0", "eslint-plugin-ft-flow": "2.0.3", @@ -68,8 +68,8 @@ "tsconfig": "*", "turbo": "1.10.15", "typescript": "5.2.2", - "viem": "2.18.7", - "wagmi": "2.12.2" + "viem": "2.21.2", + "wagmi": "2.12.8" }, "packageManager": "yarn@4.0.2" } diff --git a/yarn.lock b/yarn.lock index df981c8c..d5f01a0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10138,9 +10138,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/core@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/core@npm:2.15.3" +"@walletconnect/core@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/core@npm:2.16.0" dependencies: "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-provider": "npm:1.0.14" @@ -10153,12 +10153,12 @@ __metadata: "@walletconnect/relay-auth": "npm:1.0.4" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.3" - "@walletconnect/utils": "npm:2.15.3" + "@walletconnect/types": "npm:2.16.0" + "@walletconnect/utils": "npm:2.16.0" events: "npm:3.3.0" lodash.isequal: "npm:4.5.0" uint8arrays: "npm:3.1.0" - checksum: 5ed33c1dc911c55430d99be8174e0c5cac4c3029cd2f41082f077141037c15e891c932ef9b346158ec28bcb23551c741990ae2e0ef99a432d513c905362e0619 + checksum: 3716fc106b845db26acacd4c771fbbb42913a1ebdd40be1ddb4831213de10284312fd97839edc060ae1fc0470c35ddda312742fd08eaba37a53c7f8afc0399e7 languageName: node linkType: hard @@ -10207,21 +10207,21 @@ __metadata: languageName: node linkType: hard -"@walletconnect/ethereum-provider@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/ethereum-provider@npm:2.15.3" +"@walletconnect/ethereum-provider@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/ethereum-provider@npm:2.16.0" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/modal": "npm:2.6.2" - "@walletconnect/sign-client": "npm:2.15.3" - "@walletconnect/types": "npm:2.15.3" - "@walletconnect/universal-provider": "npm:2.15.3" - "@walletconnect/utils": "npm:2.15.3" + "@walletconnect/sign-client": "npm:2.16.0" + "@walletconnect/types": "npm:2.16.0" + "@walletconnect/universal-provider": "npm:2.16.0" + "@walletconnect/utils": "npm:2.16.0" events: "npm:3.3.0" - checksum: cee9c4da6163d7a3c31ee9337059bc2fe434306408d3445a0b1a4e948d73bd653cd39f66413c0b944a963afce1fe38d7fcdf3e22cbf0f33be93afcb38cccd9b2 + checksum: ea3563c1a7e43c709facafc1fd405bd2adf6dfe96c3f35caaca5d14b6267ea189fc182c21534a469ba99371347841c2fb9942e0abdda61534b93aa775aacdcb8 languageName: node linkType: hard @@ -10388,9 +10388,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/react-native-compat@npm:2.14.0": - version: 2.14.0 - resolution: "@walletconnect/react-native-compat@npm:2.14.0" +"@walletconnect/react-native-compat@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/react-native-compat@npm:2.16.0" dependencies: events: "npm:3.3.0" fast-text-encoding: "npm:1.0.6" @@ -10403,7 +10403,7 @@ __metadata: peerDependenciesMeta: expo-application: optional: true - checksum: f0987bf90ebc99316a9182af995e953468b54ee7e6c4e3650b5794be750a1df8707011e185dfbe7e331950a0c0af09d4290c838dd5d4e4e45d6e29569a924487 + checksum: 85a11b819cfb99d6f34cb2e28114e2b713b3d00561fec1fc485da150ab37d9cb922deca924f6374352e8d10c8394a7b4058327e35bb0cedb88ed26351f4c546a languageName: node linkType: hard @@ -10482,20 +10482,20 @@ __metadata: languageName: node linkType: hard -"@walletconnect/sign-client@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/sign-client@npm:2.15.3" +"@walletconnect/sign-client@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/sign-client@npm:2.16.0" dependencies: - "@walletconnect/core": "npm:2.15.3" + "@walletconnect/core": "npm:2.16.0" "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.3" - "@walletconnect/utils": "npm:2.15.3" + "@walletconnect/types": "npm:2.16.0" + "@walletconnect/utils": "npm:2.16.0" events: "npm:3.3.0" - checksum: 54da524134b1790a3e9e19217bd579b54c27f340d42bc06c34dabc38b0479b0607c1701ffa92f24bb04f0efa4dfd5b922edcbf46ad237c659418d2a297d0f250 + checksum: bd1b7e30b83c62eddf047e9d6d3f3e08f2661511f18d90f797767b73beec69d25d920c96900ba336ea4aec0d5fc5fad4088c80c9310b00852fe2ceb5232c095b languageName: node linkType: hard @@ -10550,9 +10550,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/types@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/types@npm:2.15.3" +"@walletconnect/types@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/types@npm:2.16.0" dependencies: "@walletconnect/events": "npm:1.0.1" "@walletconnect/heartbeat": "npm:1.2.2" @@ -10560,7 +10560,7 @@ __metadata: "@walletconnect/keyvaluestorage": "npm:1.1.1" "@walletconnect/logger": "npm:2.1.2" events: "npm:3.3.0" - checksum: 31f6fa0db943bb46b8aaf125b57de54366b219cf64371d6e326b326861ef2920a6714aa47f616510007c5e61bc2dd68d64b4bd8dc5f5035a14d7f546353991d5 + checksum: 407f339638fc2bc5363971be901e101eeb499fc9b4dd7c7e2d4728e71c47224e9eb48993a715f9c4375be551055111ed8a478df0c8b0ea772d6643f0aa1bd546 languageName: node linkType: hard @@ -10598,20 +10598,20 @@ __metadata: languageName: node linkType: hard -"@walletconnect/universal-provider@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/universal-provider@npm:2.15.3" +"@walletconnect/universal-provider@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/universal-provider@npm:2.16.0" dependencies: "@walletconnect/jsonrpc-http-connection": "npm:1.0.8" "@walletconnect/jsonrpc-provider": "npm:1.0.14" "@walletconnect/jsonrpc-types": "npm:1.0.4" "@walletconnect/jsonrpc-utils": "npm:1.0.8" "@walletconnect/logger": "npm:2.1.2" - "@walletconnect/sign-client": "npm:2.15.3" - "@walletconnect/types": "npm:2.15.3" - "@walletconnect/utils": "npm:2.15.3" + "@walletconnect/sign-client": "npm:2.16.0" + "@walletconnect/types": "npm:2.16.0" + "@walletconnect/utils": "npm:2.16.0" events: "npm:3.3.0" - checksum: 469bb310107a9b94817df4a4e3841ab4657aa6badf8641a49e2dc59f4fdfce70a7ddd2f7b4fb0ce7b9b3b6d39de075eb5854d8d6a3bc0ce526e275e838095fad + checksum: 48b2a5b472613fec76359978cad0c97777b37b79927e40ad093b7e2fe13e1f8e628dce30f0fe752925019c8706cea65b1588fe9946998f33f263add6a83a8dbe languageName: node linkType: hard @@ -10681,9 +10681,9 @@ __metadata: languageName: node linkType: hard -"@walletconnect/utils@npm:2.15.3": - version: 2.15.3 - resolution: "@walletconnect/utils@npm:2.15.3" +"@walletconnect/utils@npm:2.16.0": + version: 2.16.0 + resolution: "@walletconnect/utils@npm:2.16.0" dependencies: "@stablelib/chacha20poly1305": "npm:1.0.1" "@stablelib/hkdf": "npm:1.0.1" @@ -10694,14 +10694,14 @@ __metadata: "@walletconnect/relay-auth": "npm:1.0.4" "@walletconnect/safe-json": "npm:1.0.2" "@walletconnect/time": "npm:1.0.2" - "@walletconnect/types": "npm:2.15.3" + "@walletconnect/types": "npm:2.16.0" "@walletconnect/window-getters": "npm:1.0.1" "@walletconnect/window-metadata": "npm:1.0.1" detect-browser: "npm:5.3.0" elliptic: "npm:^6.5.7" query-string: "npm:7.1.3" uint8arrays: "npm:3.1.0" - checksum: af556c0b7926ecede7163be38626aed36670a40a03e70c32389b80ca83f4232343aee0cc4fb36898c0ed047ebdafc005cf6861c0126430333d1ea8069befca2e + checksum: fbeacc728656f8f29405e3a42e5667445707fa9077073c71260e608548f6644a8424fce7fcd407fa1eb8d039258e350f59ff43a6c9c665257daf22b7761ee7ce languageName: node linkType: hard @@ -10799,7 +10799,7 @@ __metadata: version: 0.0.0-use.local resolution: "@web3modal/ethers-react-native@workspace:packages/ethers" dependencies: - "@walletconnect/ethereum-provider": "npm:2.15.3" + "@walletconnect/ethereum-provider": "npm:2.16.0" "@web3modal/common-react-native": "npm:2.0.4" "@web3modal/scaffold-react-native": "npm:2.0.4" "@web3modal/scaffold-utils-react-native": "npm:2.0.4" @@ -10820,7 +10820,7 @@ __metadata: version: 0.0.0-use.local resolution: "@web3modal/ethers5-react-native@workspace:packages/ethers5" dependencies: - "@walletconnect/ethereum-provider": "npm:2.15.3" + "@walletconnect/ethereum-provider": "npm:2.16.0" "@web3modal/common-react-native": "npm:2.0.4" "@web3modal/scaffold-react-native": "npm:2.0.4" "@web3modal/scaffold-utils-react-native": "npm:2.0.4" @@ -25428,7 +25428,7 @@ __metadata: "@types/jest": "npm:29.5.7" "@types/qrcode": "npm:1.5.5" "@types/react": "npm:^18.2.6" - "@walletconnect/react-native-compat": "npm:2.14.0" + "@walletconnect/react-native-compat": "npm:2.16.0" babel-jest: "npm:^29.7.0" eslint: "npm:^8.46.0" eslint-plugin-ft-flow: "npm:2.0.3"