@reown/appkit-react-native 0.0.0-feat-multi-siwe-20250623145640 → 0.0.0-feat-multi-siwe-20250623183423
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/connectors/WalletConnectConnector.js +4 -1
- package/lib/commonjs/connectors/WalletConnectConnector.js.map +1 -1
- package/lib/commonjs/modal/w3m-modal/index.js +1 -1
- package/lib/commonjs/modal/w3m-modal/index.js.map +1 -1
- package/lib/commonjs/views/w3m-connecting-view/index.js +6 -7
- package/lib/commonjs/views/w3m-connecting-view/index.js.map +1 -1
- package/lib/module/connectors/WalletConnectConnector.js +4 -1
- package/lib/module/connectors/WalletConnectConnector.js.map +1 -1
- package/lib/module/modal/w3m-modal/index.js +1 -1
- package/lib/module/modal/w3m-modal/index.js.map +1 -1
- package/lib/module/views/w3m-connecting-view/index.js +7 -8
- package/lib/module/views/w3m-connecting-view/index.js.map +1 -1
- package/lib/typescript/connectors/WalletConnectConnector.d.ts.map +1 -1
- package/lib/typescript/modal/w3m-modal/index.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/connectors/WalletConnectConnector.ts +4 -1
- package/src/modal/w3m-modal/index.tsx +1 -0
- package/src/views/w3m-connecting-view/index.tsx +8 -8
|
@@ -77,8 +77,11 @@ class WalletConnectConnector extends _appkitCommonReactNative.WalletConnector {
|
|
|
77
77
|
let session;
|
|
78
78
|
|
|
79
79
|
// SIWE
|
|
80
|
+
const isEVMOnly = Object.keys(namespaces ?? {}).length === 1 && namespaces?.['eip155'];
|
|
80
81
|
const params = await siweConfig?.getMessageParams?.();
|
|
81
|
-
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0) {
|
|
82
|
+
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0 && isEVMOnly) {
|
|
83
|
+
// 1CA is only supported on EVM
|
|
84
|
+
|
|
82
85
|
// @ts-ignore
|
|
83
86
|
const result = await provider.authenticate({
|
|
84
87
|
...params,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_appkitCoreReactNative","require","_universalProvider","_appkitCommonReactNative","_appkitSiweReactNative","WalletConnectConnector","WalletConnector","constructor","config","type","init","ops","provider","getUniversalProvider","projectId","metadata","restoreSession","getProvider","session","namespaces","peer","wallet","name","icon","icons","UniversalProvider","storage","disconnect","connect","opts","siweConfig","defaultChain","universalLink","onUri","uri","ConnectionController","setWcUri","on","
|
|
1
|
+
{"version":3,"names":["_appkitCoreReactNative","require","_universalProvider","_appkitCommonReactNative","_appkitSiweReactNative","WalletConnectConnector","WalletConnector","constructor","config","type","init","ops","provider","getUniversalProvider","projectId","metadata","restoreSession","getProvider","session","namespaces","peer","wallet","name","icon","icons","UniversalProvider","storage","disconnect","connect","opts","siweConfig","defaultChain","universalLink","onUri","uri","ConnectionController","setWcUri","on","isEVMOnly","Object","keys","length","params","getMessageParams","options","enabled","result","authenticate","nonce","getNonce","methods","chains","map","chain","signedCacao","auths","p","s","chainId","getDidChainId","iss","address","getDidAddress","message","client","formatAuthMessage","request","SIWEController","verifyMessage","signature","cacao","siweSession","parseInt","setSession","onSignIn","error","console","catch","signOut","optionalNamespaces","undefined","setDefaultChain","off","Error","getNamespaces","switchNetwork","network","caipNetworkId","id","Promise","resolve","getWalletInfo","getChainId","namespace","rpcProviders","getDefaultChain","exports"],"sourceRoot":"../../../src","sources":["connectors/WalletConnectConnector.ts"],"mappings":"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"}
|
|
@@ -67,7 +67,7 @@ function AppKit() {
|
|
|
67
67
|
}, []);
|
|
68
68
|
const handleClose = async () => {
|
|
69
69
|
if (_appkitCoreReactNative.OptionsController.state.isSiweEnabled) {
|
|
70
|
-
if (_appkitSiweReactNative.SIWEController.state.status !== 'success' && !!_appkitCoreReactNative.ConnectionsController.state.activeAddress) {
|
|
70
|
+
if (_appkitSiweReactNative.SIWEController.state.status !== 'success' && _appkitCoreReactNative.ConnectionsController.state.activeNamespace === 'eip155' && !!_appkitCoreReactNative.ConnectionsController.state.activeAddress) {
|
|
71
71
|
await disconnect();
|
|
72
72
|
}
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_valtio","require","_react","_reactNative","_reactNativeModal","_interopRequireDefault","_appkitUiReactNative","_appkitCoreReactNative","_appkitSiweReactNative","_w3mRouter","_w3mHeader","_w3mSnackbar","_useCustomDimensions","_styles","_AppKitContext","e","__esModule","default","AppKit","disconnect","useAppKit","open","useSnapshot","ModalController","state","connectors","connectedConnector","ConnectorController","frameViewVisible","webviewVisible","WebviewController","themeMode","themeVariables","ThemeController","projectId","OptionsController","height","useWindowDimensions","isLandscape","useCustomDimensions","portraitHeight","landScapeHeight","StatusBar","currentHeight","authProvider","find","c","type","provider","AuthView","SocialView","Webview","showAuth","onBackButtonPress","RouterController","history","length","goBack","handleClose","prefetch","useCallback","ApiController","EventsController","sendEvent","event","isSiweEnabled","SIWEController","status","ConnectionsController","activeAddress","view","data","useEffect","React","createElement","Fragment","ThemeProvider","style","styles","modal","coverScreen","isVisible","useNativeDriver","useNativeDriverForBackdrop","statusBarTranslucent","hideModalContentWhileAnimating","propagateSwipe","onModalHide","onBackdropPress","close","testID","Card","card","maxHeight","Header","AppKitRouter","Snackbar"],"sourceRoot":"../../../../src","sources":["modal/w3m-modal/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAC,sBAAA,CAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AAYA,IAAAO,sBAAA,GAAAP,OAAA;AAEA,IAAAQ,UAAA,GAAAR,OAAA;AACA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,YAAA,GAAAV,OAAA;AACA,IAAAW,oBAAA,GAAAX,OAAA;AACA,IAAAY,OAAA,GAAAR,sBAAA,CAAAJ,OAAA;AACA,IAAAa,cAAA,GAAAb,OAAA;AAAgD,SAAAI,uBAAAU,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEzC,SAASG,MAAMA,CAAA,EAAG;EACvB,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,wBAAS,EAAC,CAAC;EAClC,MAAM;IAAEC;EAAK,CAAC,GAAG,IAAAC,mBAAW,EAACC,sCAAe,CAACC,KAAK,CAAC;EACnD,MAAM;IAAEC,UAAU;IAAEC;EAAmB,CAAC,GAAG,IAAAJ,mBAAW,EAACK,0CAAmB,CAACH,KAAK,CAAC;EACjF,MAAM;IAAEI,gBAAgB;IAAEC;EAAe,CAAC,GAAG,IAAAP,mBAAW,EAACQ,wCAAiB,CAACN,KAAK,CAAC;EACjF,MAAM;IAAEO,SAAS;IAAEC;EAAe,CAAC,GAAG,IAAAV,mBAAW,EAACW,sCAAe,CAACT,KAAK,CAAC;EACxE,MAAM;IAAEU;EAAU,CAAC,GAAG,IAAAZ,mBAAW,EAACa,wCAAiB,CAACX,KAAK,CAAC;EAC1D,MAAM;IAAEY;EAAO,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACxC,MAAM;IAAEC;EAAY,CAAC,GAAG,IAAAC,wCAAmB,EAAC,CAAC;EAC7C,MAAMC,cAAc,GAAGJ,MAAM,GAAG,EAAE;EAClC,MAAMK,eAAe,GAAGL,MAAM,GAAG,IAAI,IAAIM,sBAAS,CAACC,aAAa,IAAI,CAAC,CAAC;EACtE,MAAMC,YAAY,GAAGnB,UAAU,CAACoB,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,MAAM,CAAC,EAAEC,QAA+B;EAC7F,MAAMC,QAAQ,GAAGL,YAAY,EAAEK,QAAQ;EACvC,MAAMC,UAAU,GAAGN,YAAY,EAAEO,OAAO;EACxC,MAAMC,QAAQ,GAAG,CAAC1B,kBAAkB,IAAIA,kBAAkB,KAAK,MAAM;EAErE,MAAM2B,iBAAiB,GAAGA,CAAA,KAAM;IAC9B,IAAIC,uCAAgB,CAAC9B,KAAK,CAAC+B,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;MAC7C,OAAOF,uCAAgB,CAACG,MAAM,CAAC,CAAC;IAClC;IAEA,OAAOC,WAAW,CAAC,CAAC;EACtB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,kBAAW,EAAC,YAAY;IACvC,MAAMC,oCAAa,CAACF,QAAQ,CAAC,CAAC;IAC9BG,uCAAgB,CAACC,SAAS,CAAC;MAAEhB,IAAI,EAAE,OAAO;MAAEiB,KAAK,EAAE;IAAe,CAAC,CAAC;EACtE,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMN,WAAW,GAAG,MAAAA,CAAA,KAAY;IAC9B,IAAIvB,wCAAiB,CAACX,KAAK,CAACyC,aAAa,EAAE;MACzC,IACEC,qCAAc,CAAC1C,KAAK,CAAC2C,MAAM,KAAK,SAAS,
|
|
1
|
+
{"version":3,"names":["_valtio","require","_react","_reactNative","_reactNativeModal","_interopRequireDefault","_appkitUiReactNative","_appkitCoreReactNative","_appkitSiweReactNative","_w3mRouter","_w3mHeader","_w3mSnackbar","_useCustomDimensions","_styles","_AppKitContext","e","__esModule","default","AppKit","disconnect","useAppKit","open","useSnapshot","ModalController","state","connectors","connectedConnector","ConnectorController","frameViewVisible","webviewVisible","WebviewController","themeMode","themeVariables","ThemeController","projectId","OptionsController","height","useWindowDimensions","isLandscape","useCustomDimensions","portraitHeight","landScapeHeight","StatusBar","currentHeight","authProvider","find","c","type","provider","AuthView","SocialView","Webview","showAuth","onBackButtonPress","RouterController","history","length","goBack","handleClose","prefetch","useCallback","ApiController","EventsController","sendEvent","event","isSiweEnabled","SIWEController","status","ConnectionsController","activeNamespace","activeAddress","view","data","useEffect","React","createElement","Fragment","ThemeProvider","style","styles","modal","coverScreen","isVisible","useNativeDriver","useNativeDriverForBackdrop","statusBarTranslucent","hideModalContentWhileAnimating","propagateSwipe","onModalHide","onBackdropPress","close","testID","Card","card","maxHeight","Header","AppKitRouter","Snackbar"],"sourceRoot":"../../../../src","sources":["modal/w3m-modal/index.tsx"],"mappings":"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"}
|
|
@@ -43,26 +43,25 @@ function ConnectingView() {
|
|
|
43
43
|
const {
|
|
44
44
|
wcPairingExpiry
|
|
45
45
|
} = _appkitCoreReactNative.ConnectionController.state;
|
|
46
|
-
|
|
46
|
+
const {
|
|
47
|
+
data: routeData
|
|
48
|
+
} = _appkitCoreReactNative.RouterController.state;
|
|
47
49
|
if (retry || _appkitCoreReactNative.CoreHelperUtil.isPairingExpired(wcPairingExpiry)) {
|
|
48
50
|
_appkitCoreReactNative.ConnectionController.setWcError(false);
|
|
49
|
-
// ConnectionController.connectWalletConnect(routeData?.wallet?.link_mode ?? undefined);
|
|
50
|
-
|
|
51
51
|
let connectPromise;
|
|
52
52
|
// TODO: check phantom wallet id from cloud
|
|
53
53
|
if (data?.wallet?.id === 'phantom-wallet') {
|
|
54
54
|
connectPromise = connect('phantom');
|
|
55
55
|
} else {
|
|
56
56
|
connectPromise = connect('walletconnect', {
|
|
57
|
-
universalLink:
|
|
57
|
+
universalLink: routeData?.wallet?.link_mode ?? undefined
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
_appkitCoreReactNative.ConnectionController.setWcPromise(connectPromise);
|
|
61
61
|
await connectPromise;
|
|
62
|
-
// await ConnectionController.state.wcPromise;
|
|
63
62
|
// ConnectorController.setConnectedConnector('WALLET_CONNECT');
|
|
64
|
-
|
|
65
|
-
if (_appkitCoreReactNative.OptionsController.state.isSiweEnabled) {
|
|
63
|
+
|
|
64
|
+
if (_appkitCoreReactNative.OptionsController.state.isSiweEnabled && _appkitCoreReactNative.ConnectionsController.state.activeNamespace === 'eip155') {
|
|
66
65
|
if (_appkitSiweReactNative.SIWEController.state.status === 'success') {
|
|
67
66
|
_appkitCoreReactNative.ModalController.close();
|
|
68
67
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_valtio","require","_react","_appkitCoreReactNative","_appkitSiweReactNative","_AppKitContext","_w3mConnectingQrcode","_w3mConnectingMobile","_w3mConnectingWeb","_w3mConnectingHeader","_UiUtil","ConnectingView","connect","useAppKit","installed","useSnapshot","ApiController","state","data","RouterController","lastRetry","setLastRetry","useState","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","CoreHelperUtil","isAllowedRetry","ConnectionController","clearUri","initializeConnection","SnackController","showError","retry","wcPairingExpiry","isPairingExpired","setWcError","connectPromise","universalLink","link_mode","undefined","setWcPromise","
|
|
1
|
+
{"version":3,"names":["_valtio","require","_react","_appkitCoreReactNative","_appkitSiweReactNative","_AppKitContext","_w3mConnectingQrcode","_w3mConnectingMobile","_w3mConnectingWeb","_w3mConnectingHeader","_UiUtil","ConnectingView","connect","useAppKit","installed","useSnapshot","ApiController","state","data","RouterController","lastRetry","setLastRetry","useState","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","CoreHelperUtil","isAllowedRetry","ConnectionController","clearUri","initializeConnection","SnackController","showError","retry","wcPairingExpiry","routeData","isPairingExpired","setWcError","connectPromise","universalLink","link_mode","undefined","setWcPromise","OptionsController","isSiweEnabled","ConnectionsController","activeNamespace","SIWEController","status","ModalController","close","push","error","EventsController","sendEvent","type","event","properties","message","onCopyUri","uri","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","UiUtil","createViewTransition","headerTemplate","length","React","createElement","ConnectingHeader","platformTemplate","ConnectingQrCode","ConnectingMobile","ConnectingWeb","useEffect","_platforms","mobile_link","webapp_link","_interval","setInterval","ConstantsUtil","TEN_SEC_MS","clearInterval","Fragment"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":"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"}
|
|
@@ -71,8 +71,11 @@ export class WalletConnectConnector extends WalletConnector {
|
|
|
71
71
|
let session;
|
|
72
72
|
|
|
73
73
|
// SIWE
|
|
74
|
+
const isEVMOnly = Object.keys(namespaces ?? {}).length === 1 && namespaces?.['eip155'];
|
|
74
75
|
const params = await siweConfig?.getMessageParams?.();
|
|
75
|
-
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0) {
|
|
76
|
+
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0 && isEVMOnly) {
|
|
77
|
+
// 1CA is only supported on EVM
|
|
78
|
+
|
|
76
79
|
// @ts-ignore
|
|
77
80
|
const result = await provider.authenticate({
|
|
78
81
|
...params,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["ConnectionController","UniversalProvider","WalletConnector","getDidAddress","getDidChainId","SIWEController","WalletConnectConnector","constructor","config","type","init","ops","provider","getUniversalProvider","projectId","metadata","restoreSession","getProvider","session","namespaces","peer","wallet","name","icon","icons","storage","disconnect","connect","opts","siweConfig","defaultChain","universalLink","onUri","uri","setWcUri","on","
|
|
1
|
+
{"version":3,"names":["ConnectionController","UniversalProvider","WalletConnector","getDidAddress","getDidChainId","SIWEController","WalletConnectConnector","constructor","config","type","init","ops","provider","getUniversalProvider","projectId","metadata","restoreSession","getProvider","session","namespaces","peer","wallet","name","icon","icons","storage","disconnect","connect","opts","siweConfig","defaultChain","universalLink","onUri","uri","setWcUri","on","isEVMOnly","Object","keys","length","params","getMessageParams","options","enabled","result","authenticate","nonce","getNonce","methods","chains","map","chain","signedCacao","auths","p","s","chainId","iss","address","message","client","formatAuthMessage","request","verifyMessage","signature","cacao","siweSession","parseInt","setSession","onSignIn","error","console","catch","signOut","optionalNamespaces","undefined","setDefaultChain","off","Error","getNamespaces","switchNetwork","network","caipNetworkId","id","Promise","resolve","getWalletInfo","getChainId","namespace","rpcProviders","getDefaultChain"],"sourceRoot":"../../../src","sources":["connectors/WalletConnectConnector.ts"],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ export function AppKit() {
|
|
|
60
60
|
}, []);
|
|
61
61
|
const handleClose = async () => {
|
|
62
62
|
if (OptionsController.state.isSiweEnabled) {
|
|
63
|
-
if (SIWEController.state.status !== 'success' && !!ConnectionsController.state.activeAddress) {
|
|
63
|
+
if (SIWEController.state.status !== 'success' && ConnectionsController.state.activeNamespace === 'eip155' && !!ConnectionsController.state.activeAddress) {
|
|
64
64
|
await disconnect();
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useSnapshot","useCallback","useEffect","useWindowDimensions","StatusBar","Modal","Card","ThemeProvider","ApiController","ConnectorController","EventsController","ModalController","OptionsController","RouterController","WebviewController","ThemeController","ConnectionsController","SIWEController","AppKitRouter","Header","Snackbar","useCustomDimensions","styles","useAppKit","AppKit","disconnect","open","state","connectors","connectedConnector","frameViewVisible","webviewVisible","themeMode","themeVariables","projectId","height","isLandscape","portraitHeight","landScapeHeight","currentHeight","authProvider","find","c","type","provider","AuthView","SocialView","Webview","showAuth","onBackButtonPress","history","length","goBack","handleClose","prefetch","sendEvent","event","isSiweEnabled","status","activeAddress","view","data","React","createElement","Fragment","style","modal","coverScreen","isVisible","useNativeDriver","useNativeDriverForBackdrop","statusBarTranslucent","hideModalContentWhileAnimating","propagateSwipe","onModalHide","onBackdropPress","close","testID","card","maxHeight"],"sourceRoot":"../../../../src","sources":["modal/w3m-modal/index.tsx"],"mappings":"AAAA,SAASA,WAAW,QAAQ,QAAQ;AACpC,SAASC,WAAW,EAAEC,SAAS,QAAQ,OAAO;AAC9C,SAASC,mBAAmB,EAAEC,SAAS,QAAQ,cAAc;AAC7D,OAAOC,KAAK,MAAM,oBAAoB;AACtC,SAASC,IAAI,EAAEC,aAAa,QAAQ,+BAA+B;AACnE,SACEC,aAAa,EACbC,mBAAmB,EACnBC,gBAAgB,EAChBC,eAAe,EACfC,iBAAiB,EACjBC,gBAAgB,EAEhBC,iBAAiB,EACjBC,eAAe,EACfC,qBAAqB,QAChB,iCAAiC;AACxC,SAASC,cAAc,QAAQ,iCAAiC;AAEhE,SAASC,YAAY,QAAQ,eAAe;AAC5C,SAASC,MAAM,QAAQ,2BAA2B;AAClD,SAASC,QAAQ,QAAQ,6BAA6B;AACtD,SAASC,mBAAmB,QAAQ,iCAAiC;AACrE,OAAOC,MAAM,MAAM,UAAU;AAC7B,SAASC,SAAS,QAAQ,qBAAqB;AAE/C,OAAO,SAASC,MAAMA,CAAA,EAAG;EACvB,MAAM;IAAEC;EAAW,CAAC,GAAGF,SAAS,CAAC,CAAC;EAClC,MAAM;IAAEG;EAAK,CAAC,GAAG1B,WAAW,CAACW,eAAe,CAACgB,KAAK,CAAC;EACnD,MAAM;IAAEC,UAAU;IAAEC;EAAmB,CAAC,GAAG7B,WAAW,CAACS,mBAAmB,CAACkB,KAAK,CAAC;EACjF,MAAM;IAAEG,gBAAgB;IAAEC;EAAe,CAAC,GAAG/B,WAAW,CAACc,iBAAiB,CAACa,KAAK,CAAC;EACjF,MAAM;IAAEK,SAAS;IAAEC;EAAe,CAAC,GAAGjC,WAAW,CAACe,eAAe,CAACY,KAAK,CAAC;EACxE,MAAM;IAAEO;EAAU,CAAC,GAAGlC,WAAW,CAACY,iBAAiB,CAACe,KAAK,CAAC;EAC1D,MAAM;IAAEQ;EAAO,CAAC,GAAGhC,mBAAmB,CAAC,CAAC;EACxC,MAAM;IAAEiC;EAAY,CAAC,GAAGf,mBAAmB,CAAC,CAAC;EAC7C,MAAMgB,cAAc,GAAGF,MAAM,GAAG,EAAE;EAClC,MAAMG,eAAe,GAAGH,MAAM,GAAG,IAAI,IAAI/B,SAAS,CAACmC,aAAa,IAAI,CAAC,CAAC;EACtE,MAAMC,YAAY,GAAGZ,UAAU,CAACa,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,MAAM,CAAC,EAAEC,QAA+B;EAC7F,MAAMC,QAAQ,GAAGL,YAAY,EAAEK,QAAQ;EACvC,MAAMC,UAAU,GAAGN,YAAY,EAAEO,OAAO;EACxC,MAAMC,QAAQ,GAAG,CAACnB,kBAAkB,IAAIA,kBAAkB,KAAK,MAAM;EAErE,MAAMoB,iBAAiB,GAAGA,CAAA,KAAM;IAC9B,IAAIpC,gBAAgB,CAACc,KAAK,CAACuB,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;MAC7C,OAAOtC,gBAAgB,CAACuC,MAAM,CAAC,CAAC;IAClC;IAEA,OAAOC,WAAW,CAAC,CAAC;EACtB,CAAC;EAED,MAAMC,QAAQ,GAAGrD,WAAW,CAAC,YAAY;IACvC,MAAMO,aAAa,CAAC8C,QAAQ,CAAC,CAAC;IAC9B5C,gBAAgB,CAAC6C,SAAS,CAAC;MAAEZ,IAAI,EAAE,OAAO;MAAEa,KAAK,EAAE;IAAe,CAAC,CAAC;EACtE,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMH,WAAW,GAAG,MAAAA,CAAA,KAAY;IAC9B,IAAIzC,iBAAiB,CAACe,KAAK,CAAC8B,aAAa,EAAE;MACzC,IACExC,cAAc,CAACU,KAAK,CAAC+B,MAAM,KAAK,SAAS,
|
|
1
|
+
{"version":3,"names":["useSnapshot","useCallback","useEffect","useWindowDimensions","StatusBar","Modal","Card","ThemeProvider","ApiController","ConnectorController","EventsController","ModalController","OptionsController","RouterController","WebviewController","ThemeController","ConnectionsController","SIWEController","AppKitRouter","Header","Snackbar","useCustomDimensions","styles","useAppKit","AppKit","disconnect","open","state","connectors","connectedConnector","frameViewVisible","webviewVisible","themeMode","themeVariables","projectId","height","isLandscape","portraitHeight","landScapeHeight","currentHeight","authProvider","find","c","type","provider","AuthView","SocialView","Webview","showAuth","onBackButtonPress","history","length","goBack","handleClose","prefetch","sendEvent","event","isSiweEnabled","status","activeNamespace","activeAddress","view","data","React","createElement","Fragment","style","modal","coverScreen","isVisible","useNativeDriver","useNativeDriverForBackdrop","statusBarTranslucent","hideModalContentWhileAnimating","propagateSwipe","onModalHide","onBackdropPress","close","testID","card","maxHeight"],"sourceRoot":"../../../../src","sources":["modal/w3m-modal/index.tsx"],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useSnapshot } from 'valtio';
|
|
2
2
|
import { useEffect, useState } from 'react';
|
|
3
|
-
import {
|
|
3
|
+
import { ConnectionController, ConstantsUtil, CoreHelperUtil, ModalController, RouterController, SnackController, OptionsController, ApiController, EventsController, ConnectionsController } from '@reown/appkit-core-react-native';
|
|
4
4
|
import { SIWEController } from '@reown/appkit-siwe-react-native';
|
|
5
5
|
import { useAppKit } from '../../AppKitContext';
|
|
6
6
|
import { ConnectingQrCode } from '../../partials/w3m-connecting-qrcode';
|
|
@@ -37,26 +37,25 @@ export function ConnectingView() {
|
|
|
37
37
|
const {
|
|
38
38
|
wcPairingExpiry
|
|
39
39
|
} = ConnectionController.state;
|
|
40
|
-
|
|
40
|
+
const {
|
|
41
|
+
data: routeData
|
|
42
|
+
} = RouterController.state;
|
|
41
43
|
if (retry || CoreHelperUtil.isPairingExpired(wcPairingExpiry)) {
|
|
42
44
|
ConnectionController.setWcError(false);
|
|
43
|
-
// ConnectionController.connectWalletConnect(routeData?.wallet?.link_mode ?? undefined);
|
|
44
|
-
|
|
45
45
|
let connectPromise;
|
|
46
46
|
// TODO: check phantom wallet id from cloud
|
|
47
47
|
if (data?.wallet?.id === 'phantom-wallet') {
|
|
48
48
|
connectPromise = connect('phantom');
|
|
49
49
|
} else {
|
|
50
50
|
connectPromise = connect('walletconnect', {
|
|
51
|
-
universalLink:
|
|
51
|
+
universalLink: routeData?.wallet?.link_mode ?? undefined
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
ConnectionController.setWcPromise(connectPromise);
|
|
55
55
|
await connectPromise;
|
|
56
|
-
// await ConnectionController.state.wcPromise;
|
|
57
56
|
// ConnectorController.setConnectedConnector('WALLET_CONNECT');
|
|
58
|
-
|
|
59
|
-
if (OptionsController.state.isSiweEnabled) {
|
|
57
|
+
|
|
58
|
+
if (OptionsController.state.isSiweEnabled && ConnectionsController.state.activeNamespace === 'eip155') {
|
|
60
59
|
if (SIWEController.state.status === 'success') {
|
|
61
60
|
ModalController.close();
|
|
62
61
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useSnapshot","useEffect","useState","
|
|
1
|
+
{"version":3,"names":["useSnapshot","useEffect","useState","ConnectionController","ConstantsUtil","CoreHelperUtil","ModalController","RouterController","SnackController","OptionsController","ApiController","EventsController","ConnectionsController","SIWEController","useAppKit","ConnectingQrCode","ConnectingMobile","ConnectingWeb","ConnectingHeader","UiUtil","ConnectingView","connect","installed","state","data","lastRetry","setLastRetry","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","isAllowedRetry","clearUri","initializeConnection","showError","retry","wcPairingExpiry","routeData","isPairingExpired","setWcError","connectPromise","universalLink","link_mode","undefined","setWcPromise","isSiweEnabled","activeNamespace","status","close","push","error","sendEvent","type","event","properties","message","onCopyUri","uri","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","createViewTransition","headerTemplate","length","React","createElement","platformTemplate","_platforms","mobile_link","webapp_link","_interval","setInterval","TEN_SEC_MS","clearInterval","Fragment"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":"AAAA,SAASA,WAAW,QAAQ,QAAQ;AACpC,SAASC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SACEC,oBAAoB,EACpBC,aAAa,EACbC,cAAc,EACdC,eAAe,EACfC,gBAAgB,EAChBC,eAAe,EAEfC,iBAAiB,EACjBC,aAAa,EACbC,gBAAgB,EAChBC,qBAAqB,QAChB,iCAAiC;AACxC,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,SAAS,QAAQ,qBAAqB;AAC/C,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,aAAa,QAAQ,mCAAmC;AACjE,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,MAAM,QAAQ,oBAAoB;AAE3C,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,MAAM;IAAEC;EAAQ,CAAC,GAAGP,SAAS,CAAC,CAAC;EAC/B,MAAM;IAAEQ;EAAU,CAAC,GAAGtB,WAAW,CAACU,aAAa,CAACa,KAAK,CAAC;EACtD,MAAM;IAAEC;EAAK,CAAC,GAAGjB,gBAAgB,CAACgB,KAAK;EACvC,MAAM,CAACE,SAAS,EAAEC,YAAY,CAAC,GAAGxB,QAAQ,CAACyB,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;EACtD,MAAMC,IAAI,GAAG,CAACL,IAAI,EAAEM,MAAM;EAC1B,MAAMC,WAAW,GAAG,CAAC,CAACT,SAAS,EAAEU,IAAI,CAACF,MAAM,IAAIA,MAAM,CAACG,EAAE,KAAKT,IAAI,EAAEM,MAAM,EAAEG,EAAE,CAAC;EAE/E,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAGjC,QAAQ,CAAW,CAAC;EACpD,MAAM,CAACkC,SAAS,EAAEC,YAAY,CAAC,GAAGnC,QAAQ,CAAa,EAAE,CAAC;EAE1D,MAAMoC,OAAO,GAAGA,CAAA,KAAM;IACpB,IAAIjC,cAAc,CAACkC,cAAc,CAACd,SAAS,CAAC,EAAE;MAC5CC,YAAY,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;MACxBzB,oBAAoB,CAACqC,QAAQ,CAAC,CAAC;MAC/BC,oBAAoB,CAAC,IAAI,CAAC;IAC5B,CAAC,MAAM;MACLjC,eAAe,CAACkC,SAAS,CAAC,sCAAsC,CAAC;IACnE;EACF,CAAC;EAED,MAAMD,oBAAoB,GAAG,MAAAA,CAAOE,KAAK,GAAG,KAAK,KAAK;IACpD,IAAI;MACF,MAAM;QAAEC;MAAgB,CAAC,GAAGzC,oBAAoB,CAACoB,KAAK;MACtD,MAAM;QAAEC,IAAI,EAAEqB;MAAU,CAAC,GAAGtC,gBAAgB,CAACgB,KAAK;MAClD,IAAIoB,KAAK,IAAItC,cAAc,CAACyC,gBAAgB,CAACF,eAAe,CAAC,EAAE;QAC7DzC,oBAAoB,CAAC4C,UAAU,CAAC,KAAK,CAAC;QAEtC,IAAIC,cAA6B;QACjC;QACA,IAAIxB,IAAI,EAAEM,MAAM,EAAEG,EAAE,KAAK,gBAAgB,EAAE;UACzCe,cAAc,GAAG3B,OAAO,CAAC,SAAS,CAAC;QACrC,CAAC,MAAM;UACL2B,cAAc,GAAG3B,OAAO,CAAC,eAAe,EAAE;YACxC4B,aAAa,EAAEJ,SAAS,EAAEf,MAAM,EAAEoB,SAAS,IAAIC;UACjD,CAAC,CAAC;QACJ;QACAhD,oBAAoB,CAACiD,YAAY,CAACJ,cAAc,CAAC;QACjD,MAAMA,cAAc;QACpB;;QAEA,IACEvC,iBAAiB,CAACc,KAAK,CAAC8B,aAAa,IACrCzC,qBAAqB,CAACW,KAAK,CAAC+B,eAAe,KAAK,QAAQ,EACxD;UACA,IAAIzC,cAAc,CAACU,KAAK,CAACgC,MAAM,KAAK,SAAS,EAAE;YAC7CjD,eAAe,CAACkD,KAAK,CAAC,CAAC;UACzB,CAAC,MAAM;YACLjD,gBAAgB,CAACkD,IAAI,CAAC,gBAAgB,CAAC;UACzC;QACF,CAAC,MAAM;UACLnD,eAAe,CAACkD,KAAK,CAAC,CAAC;QACzB;MACF;IACF,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdvD,oBAAoB,CAAC4C,UAAU,CAAC,IAAI,CAAC;MACrC5C,oBAAoB,CAACqC,QAAQ,CAAC,CAAC;MAC/BhC,eAAe,CAACkC,SAAS,CAAC,UAAU,CAAC;MACrC,IAAIb,IAAI,IAAIxB,cAAc,CAACkC,cAAc,CAACd,SAAS,CAAC,EAAE;QACpDC,YAAY,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;QACxBa,oBAAoB,CAAC,IAAI,CAAC;MAC5B;MACA9B,gBAAgB,CAACgD,SAAS,CAAC;QACzBC,IAAI,EAAE,OAAO;QACbC,KAAK,EAAE,eAAe;QACtBC,UAAU,EAAE;UACVC,OAAO,EAAGL,KAAK,EAAYK,OAAO,IAAI;QACxC;MACF,CAAC,CAAC;IACJ;EACF,CAAC;EAED,MAAMC,SAAS,GAAIC,GAAY,IAAK;IAClC,IAAIxD,iBAAiB,CAACyD,oBAAoB,CAAC,CAAC,IAAID,GAAG,EAAE;MACnDxD,iBAAiB,CAAC0D,eAAe,CAACF,GAAG,CAAC;MACtCzD,eAAe,CAAC4D,WAAW,CAAC,aAAa,CAAC;IAC5C;EACF,CAAC;EAED,MAAMC,gBAAgB,GAAIC,GAAa,IAAK;IAC1CnD,MAAM,CAACoD,oBAAoB,CAAC,CAAC;IAC7BpC,WAAW,CAACmC,GAAG,CAAC;EAClB,CAAC;EAED,MAAME,cAAc,GAAGA,CAAA,KAAM;IAC3B,IAAI3C,IAAI,EAAE,OAAO,IAAI;IAErB,IAAIO,SAAS,CAACqC,MAAM,GAAG,CAAC,EAAE;MACxB,oBAAOC,KAAA,CAAAC,aAAA,CAACzD,gBAAgB;QAACkB,SAAS,EAAEA,SAAU;QAACiC,gBAAgB,EAAEA;MAAiB,CAAE,CAAC;IACvF;IAEA,OAAO,IAAI;EACb,CAAC;EAED,MAAMO,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI/C,IAAI,EAAE;MACR,oBAAO6C,KAAA,CAAAC,aAAA,CAAC5D,gBAAgB,MAAE,CAAC;IAC7B;IAEA,QAAQmB,QAAQ;MACd,KAAK,QAAQ;QACX,oBACEwC,KAAA,CAAAC,aAAA,CAAC3D,gBAAgB;UAACsB,OAAO,EAAEA,OAAQ;UAAC0B,SAAS,EAAEA,SAAU;UAACjC,WAAW,EAAEA;QAAY,CAAE,CAAC;MAE1F,KAAK,KAAK;QACR,oBAAO2C,KAAA,CAAAC,aAAA,CAAC1D,aAAa;UAAC+C,SAAS,EAAEA;QAAU,CAAE,CAAC;MAChD;QACE,OAAOb,SAAS;IACpB;EACF,CAAC;EAEDlD,SAAS,CAAC,MAAM;IACd,MAAM4E,UAAsB,GAAG,EAAE;IACjC,IAAIrD,IAAI,EAAEM,MAAM,EAAEgD,WAAW,EAAE;MAC7BD,UAAU,CAACpB,IAAI,CAAC,QAAQ,CAAC;IAC3B;IACA,IAAIjC,IAAI,EAAEM,MAAM,EAAEiD,WAAW,IAAI,CAAChD,WAAW,EAAE;MAC7C8C,UAAU,CAACpB,IAAI,CAAC,KAAK,CAAC;IACxB;IAEApB,YAAY,CAACwC,UAAU,CAAC;IACxB1C,WAAW,CAAC0C,UAAU,CAAC,CAAC,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACrD,IAAI,EAAEO,WAAW,CAAC,CAAC;EAEvB9B,SAAS,CAAC,MAAM;IACdwC,oBAAoB,CAAC,CAAC;IACtB,IAAIuC,SAAyB;;IAE7B;IACA,IAAInD,IAAI,EAAE;MACRmD,SAAS,GAAGC,WAAW,CAACxC,oBAAoB,EAAErC,aAAa,CAAC8E,UAAU,CAAC;IACzE;IAEA,OAAO,MAAMC,aAAa,CAACH,SAAS,CAAC;IACrC;EACF,CAAC,EAAE,CAACnD,IAAI,CAAC,CAAC;EAEV,oBACE6C,KAAA,CAAAC,aAAA,CAAAD,KAAA,CAAAU,QAAA,QACGZ,cAAc,CAAC,CAAC,EAChBI,gBAAgB,CAAC,CAClB,CAAC;AAEP"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletConnectConnector.d.ts","sourceRoot":"","sources":["../../../src/connectors/WalletConnectConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAE1B,MAAM,mCAAmC,CAAC;AAG3C,UAAU,4BAA4B;IACpC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,sBAAuB,SAAQ,eAAe;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAE1C,MAAM,EAAE,4BAA4B;IAKjC,IAAI,CAAC,GAAG,EAAE,oBAAoB;YAa/B,cAAc;YAwBd,oBAAoB;IAkBzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,OAAO,CAAC,IAAI,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"WalletConnectConnector.d.ts","sourceRoot":"","sources":["../../../src/connectors/WalletConnectConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAE1B,MAAM,mCAAmC,CAAC;AAG3C,UAAU,4BAA4B;IACpC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,sBAAuB,SAAQ,eAAe;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAE1C,MAAM,EAAE,4BAA4B;IAKjC,IAAI,CAAC,GAAG,EAAE,oBAAoB;YAa/B,cAAc;YAwBd,oBAAoB;IAkBzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,OAAO,CAAC,IAAI,EAAE,cAAc;IAmGlC,WAAW,IAAI,QAAQ;IAQvB,aAAa,IAAI,UAAU;IAI3B,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpD,aAAa,IAAI,UAAU,GAAG,SAAS;IAIvC,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS;CAe1E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modal/w3m-modal/index.tsx"],"names":[],"mappings":"AA0BA,wBAAgB,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modal/w3m-modal/index.tsx"],"names":[],"mappings":"AA0BA,wBAAgB,MAAM,4CAoFrB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reown/appkit-react-native",
|
|
3
|
-
"version": "0.0.0-feat-multi-siwe-
|
|
3
|
+
"version": "0.0.0-feat-multi-siwe-20250623183423",
|
|
4
4
|
"main": "lib/commonjs/index.js",
|
|
5
5
|
"types": "lib/typescript/index.d.ts",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
"access": "public"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@reown/appkit-common-react-native": "0.0.0-feat-multi-siwe-
|
|
41
|
-
"@reown/appkit-core-react-native": "0.0.0-feat-multi-siwe-
|
|
42
|
-
"@reown/appkit-siwe-react-native": "0.0.0-feat-multi-siwe-
|
|
43
|
-
"@reown/appkit-ui-react-native": "0.0.0-feat-multi-siwe-
|
|
40
|
+
"@reown/appkit-common-react-native": "0.0.0-feat-multi-siwe-20250623183423",
|
|
41
|
+
"@reown/appkit-core-react-native": "0.0.0-feat-multi-siwe-20250623183423",
|
|
42
|
+
"@reown/appkit-siwe-react-native": "0.0.0-feat-multi-siwe-20250623183423",
|
|
43
|
+
"@reown/appkit-ui-react-native": "0.0.0-feat-multi-siwe-20250623183423",
|
|
44
44
|
"@walletconnect/universal-provider": "2.20.2",
|
|
45
45
|
"valtio": "^1.13.2"
|
|
46
46
|
},
|
|
@@ -99,8 +99,11 @@ export class WalletConnectConnector extends WalletConnector {
|
|
|
99
99
|
let session;
|
|
100
100
|
|
|
101
101
|
// SIWE
|
|
102
|
+
const isEVMOnly = Object.keys(namespaces ?? {}).length === 1 && namespaces?.['eip155'];
|
|
102
103
|
const params = await siweConfig?.getMessageParams?.();
|
|
103
|
-
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0) {
|
|
104
|
+
if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0 && isEVMOnly) {
|
|
105
|
+
// 1CA is only supported on EVM
|
|
106
|
+
|
|
104
107
|
// @ts-ignore
|
|
105
108
|
const result = await provider.authenticate(
|
|
106
109
|
{
|
|
@@ -57,6 +57,7 @@ export function AppKit() {
|
|
|
57
57
|
if (OptionsController.state.isSiweEnabled) {
|
|
58
58
|
if (
|
|
59
59
|
SIWEController.state.status !== 'success' &&
|
|
60
|
+
ConnectionsController.state.activeNamespace === 'eip155' &&
|
|
60
61
|
!!ConnectionsController.state.activeAddress
|
|
61
62
|
) {
|
|
62
63
|
await disconnect();
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useSnapshot } from 'valtio';
|
|
2
2
|
import { useEffect, useState } from 'react';
|
|
3
3
|
import {
|
|
4
|
-
AccountController,
|
|
5
4
|
ConnectionController,
|
|
6
5
|
ConstantsUtil,
|
|
7
6
|
CoreHelperUtil,
|
|
@@ -11,7 +10,8 @@ import {
|
|
|
11
10
|
type Platform,
|
|
12
11
|
OptionsController,
|
|
13
12
|
ApiController,
|
|
14
|
-
EventsController
|
|
13
|
+
EventsController,
|
|
14
|
+
ConnectionsController
|
|
15
15
|
} from '@reown/appkit-core-react-native';
|
|
16
16
|
import { SIWEController } from '@reown/appkit-siwe-react-native';
|
|
17
17
|
import { useAppKit } from '../../AppKitContext';
|
|
@@ -45,10 +45,9 @@ export function ConnectingView() {
|
|
|
45
45
|
const initializeConnection = async (retry = false) => {
|
|
46
46
|
try {
|
|
47
47
|
const { wcPairingExpiry } = ConnectionController.state;
|
|
48
|
-
|
|
48
|
+
const { data: routeData } = RouterController.state;
|
|
49
49
|
if (retry || CoreHelperUtil.isPairingExpired(wcPairingExpiry)) {
|
|
50
50
|
ConnectionController.setWcError(false);
|
|
51
|
-
// ConnectionController.connectWalletConnect(routeData?.wallet?.link_mode ?? undefined);
|
|
52
51
|
|
|
53
52
|
let connectPromise: Promise<void>;
|
|
54
53
|
// TODO: check phantom wallet id from cloud
|
|
@@ -56,16 +55,17 @@ export function ConnectingView() {
|
|
|
56
55
|
connectPromise = connect('phantom');
|
|
57
56
|
} else {
|
|
58
57
|
connectPromise = connect('walletconnect', {
|
|
59
|
-
universalLink:
|
|
58
|
+
universalLink: routeData?.wallet?.link_mode ?? undefined
|
|
60
59
|
});
|
|
61
60
|
}
|
|
62
61
|
ConnectionController.setWcPromise(connectPromise);
|
|
63
62
|
await connectPromise;
|
|
64
|
-
// await ConnectionController.state.wcPromise;
|
|
65
63
|
// ConnectorController.setConnectedConnector('WALLET_CONNECT');
|
|
66
|
-
AccountController.setIsConnected(true);
|
|
67
64
|
|
|
68
|
-
if (
|
|
65
|
+
if (
|
|
66
|
+
OptionsController.state.isSiweEnabled &&
|
|
67
|
+
ConnectionsController.state.activeNamespace === 'eip155'
|
|
68
|
+
) {
|
|
69
69
|
if (SIWEController.state.status === 'success') {
|
|
70
70
|
ModalController.close();
|
|
71
71
|
} else {
|