@reown/appkit-react-native 0.0.0-develop-20251114152149 → 0.0.0-develop-20251114183547

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.
Files changed (7) hide show
  1. package/lib/commonjs/views/w3m-connecting-view/index.js +10 -14
  2. package/lib/commonjs/views/w3m-connecting-view/index.js.map +1 -1
  3. package/lib/module/views/w3m-connecting-view/index.js +11 -15
  4. package/lib/module/views/w3m-connecting-view/index.js.map +1 -1
  5. package/lib/typescript/views/w3m-connecting-view/index.d.ts.map +1 -1
  6. package/package.json +4 -4
  7. package/src/views/w3m-connecting-view/index.tsx +12 -18
package/lib/commonjs/views/w3m-connecting-view/index.js CHANGED
@@ -24,21 +24,20 @@ function ConnectingView() {
24
24
  const {
25
25
  data
26
26
  } = _appkitCoreReactNative.RouterController.state;
27
- const [lastRetry, setLastRetry] = (0, _react.useState)(Date.now());
27
+ const lastRetryRef = (0, _react.useRef)(Date.now());
28
28
  const isQr = !data?.wallet;
29
29
  const isInstalled = !!installed?.find(wallet => wallet.id === data?.wallet?.id);
30
30
  const [platform, setPlatform] = (0, _react.useState)();
31
31
  const [platforms, setPlatforms] = (0, _react.useState)([]);
32
32
  const onRetry = () => {
33
- if (_appkitCoreReactNative.CoreHelperUtil.isAllowedRetry(lastRetry)) {
34
- setLastRetry(Date.now());
35
- _appkitCoreReactNative.WcController.clearUri();
33
+ if (_appkitCoreReactNative.CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
34
+ lastRetryRef.current = Date.now();
36
35
  initializeConnection(true);
37
36
  } else {
38
37
  _appkitCoreReactNative.SnackController.showError('Please wait a second before retrying');
39
38
  }
40
39
  };
41
- const initializeConnection = async (retry = false, retryTimestamp) => {
40
+ const initializeConnection = async (retry = false) => {
42
41
  try {
43
42
  const {
44
43
  wcPairingExpiry
@@ -49,6 +48,7 @@ function ConnectingView() {
49
48
  const isPairingExpired = _appkitCoreReactNative.CoreHelperUtil.isPairingExpired(wcPairingExpiry);
50
49
  if (retry || isPairingExpired) {
51
50
  _appkitCoreReactNative.WcController.setWcError(false);
51
+ _appkitCoreReactNative.WcController.clearUri();
52
52
  const connectPromise = connect({
53
53
  wallet: routeData?.wallet
54
54
  });
@@ -58,14 +58,6 @@ function ConnectingView() {
58
58
  } catch (error) {
59
59
  _appkitCoreReactNative.LogController.sendError(error, 'ConnectingView.tsx', 'initializeConnection');
60
60
  _appkitCoreReactNative.WcController.setWcError(true);
61
- _appkitCoreReactNative.WcController.clearUri();
62
- const currentRetryTime = retryTimestamp ?? lastRetry;
63
- if (isQr && _appkitCoreReactNative.CoreHelperUtil.isAllowedRetry(currentRetryTime)) {
64
- const newRetryTime = Date.now();
65
- setLastRetry(newRetryTime);
66
- initializeConnection(true, newRetryTime);
67
- return;
68
- }
69
61
  const isUserRejected = _appkitCommonReactNative.ErrorUtil.isUserRejectedRequestError(error);
70
62
  const isProposalExpired = _appkitCommonReactNative.ErrorUtil.isProposalExpiredError(error);
71
63
  if (!isProposalExpired) {
@@ -78,6 +70,10 @@ function ConnectingView() {
78
70
  message: error?.message ?? 'Unknown'
79
71
  }
80
72
  });
73
+ if (isQr && _appkitCoreReactNative.CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
74
+ lastRetryRef.current = Date.now();
75
+ initializeConnection(true);
76
+ }
81
77
  }
82
78
  };
83
79
  const onCopyUri = uri => {
@@ -101,7 +97,7 @@ function ConnectingView() {
101
97
  setPlatform(_platforms[0]);
102
98
  }, [data, isInstalled]);
103
99
  (0, _react.useEffect)(() => {
104
- initializeConnection();
100
+ initializeConnection(true);
105
101
  let _interval;
106
102
 
107
103
  // Check if the pairing expired every 10 seconds. If expired, it will create a new uri.
package/lib/commonjs/views/w3m-connecting-view/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_valtio","require","_react","_appkitCommonReactNative","_appkitCoreReactNative","_AppKitContext","_w3mConnectingQrcode","_w3mConnectingMobile","_w3mConnectingWeb","_w3mConnectingHeader","_jsxRuntime","ConnectingView","connect","useInternalAppKit","installed","useSnapshot","ApiController","state","data","RouterController","lastRetry","setLastRetry","useState","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","CoreHelperUtil","isAllowedRetry","WcController","clearUri","initializeConnection","SnackController","showError","retry","retryTimestamp","wcPairingExpiry","routeData","isPairingExpired","setWcError","connectPromise","setWcPromise","error","LogController","sendError","currentRetryTime","newRetryTime","isUserRejected","ErrorUtil","isUserRejectedRequestError","isProposalExpired","isProposalExpiredError","EventsController","sendEvent","type","event","properties","message","onCopyUri","uri","OptionsController","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","useLayoutEffect","_platforms","mobile_link","push","webapp_link","useEffect","_interval","setInterval","ConstantsUtil","TEN_SEC_MS","clearInterval","jsxs","Fragment","children","length","jsx","ConnectingHeader","ConnectingQrCode","ConnectingMobile","ConnectingWeb"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AAWA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AACA,IAAAO,iBAAA,GAAAP,OAAA;AACA,IAAAQ,oBAAA,GAAAR,OAAA;AAAwE,IAAAS,WAAA,GAAAT,OAAA;AAEjE,SAASU,cAAcA,CAAA,EAAG;EAC/B,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,gCAAiB,EAAC,CAAC;EACvC,MAAM;IAAEC;EAAU,CAAC,GAAG,IAAAC,mBAAW,EAACC,oCAAa,CAACC,KAAK,CAAC;EACtD,MAAM;IAAEC;EAAK,CAAC,GAAGC,uCAAgB,CAACF,KAAK;EACvC,MAAM,CAACG,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAACC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;EACtD,MAAMC,IAAI,GAAG,CAACP,IAAI,EAAEQ,MAAM;EAC1B,MAAMC,WAAW,GAAG,CAAC,CAACb,SAAS,EAAEc,IAAI,CAACF,MAAM,IAAIA,MAAM,CAACG,EAAE,KAAKX,IAAI,EAAEQ,MAAM,EAAEG,EAAE,CAAC;EAE/E,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAG,IAAAT,eAAQ,EAAW,CAAC;EACpD,MAAM,CAACU,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAX,eAAQ,EAAa,EAAE,CAAC;EAE1D,MAAMY,OAAO,GAAGA,CAAA,KAAM;IACpB,IAAIC,qCAAc,CAACC,cAAc,CAAChB,SAAS,CAAC,EAAE;MAC5CC,YAAY,CAACE,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;MACxBa,mCAAY,CAACC,QAAQ,CAAC,CAAC;MACvBC,oBAAoB,CAAC,IAAI,CAAC;IAC5B,CAAC,MAAM;MACLC,sCAAe,CAACC,SAAS,CAAC,sCAAsC,CAAC;IACnE;EACF,CAAC;EAED,MAAMF,oBAAoB,GAAG,MAAAA,CAAOG,KAAK,GAAG,KAAK,EAAEC,cAAuB,KAAK;IAC7E,IAAI;MACF,MAAM;QAAEC;MAAgB,CAAC,GAAGP,mCAAY,CAACpB,KAAK;MAC9C,MAAM;QAAEC,IAAI,EAAE2B;MAAU,CAAC,GAAG1B,uCAAgB,CAACF,KAAK;MAClD,MAAM6B,gBAAgB,GAAGX,qCAAc,CAACW,gBAAgB,CAACF,eAAe,CAAC;MACzE,IAAIF,KAAK,IAAII,gBAAgB,EAAE;QAC7BT,mCAAY,CAACU,UAAU,CAAC,KAAK,CAAC;QAE9B,MAAMC,cAAc,GAAGpC,OAAO,CAAC;UAC7Bc,MAAM,EAAEmB,SAAS,EAAEnB;QACrB,CAAC,CAAC;QACFW,mCAAY,CAACY,YAAY,CAACD,cAAc,CAAC;QACzC,MAAMA,cAAc;MACtB;IACF,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdC,oCAAa,CAACC,SAAS,CAACF,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,CAAC;MAC5Eb,mCAAY,CAACU,UAAU,CAAC,IAAI,CAAC;MAC7BV,mCAAY,CAACC,QAAQ,CAAC,CAAC;MAEvB,MAAMe,gBAAgB,GAAGV,cAAc,IAAIvB,SAAS;MAEpD,IAAIK,IAAI,IAAIU,qCAAc,CAACC,cAAc,CAACiB,gBAAgB,CAAC,EAAE;QAC3D,MAAMC,YAAY,GAAG/B,IAAI,CAACC,GAAG,CAAC,CAAC;QAC/BH,YAAY,CAACiC,YAAY,CAAC;QAC1Bf,oBAAoB,CAAC,IAAI,EAAEe,YAAY,CAAC;QAExC;MACF;MAEA,MAAMC,cAAc,GAAGC,kCAAS,CAACC,0BAA0B,CAACP,KAAK,CAAC;MAClE,MAAMQ,iBAAiB,GAAGF,kCAAS,CAACG,sBAAsB,CAACT,KAAK,CAAC;MACjE,IAAI,CAACQ,iBAAiB,EAAE;QACtBlB,sCAAe,CAACC,SAAS,CACvBc,cAAc,GAAG,2BAA2B,GAAG,sBACjD,CAAC;MACH;MAEAK,uCAAgB,CAACC,SAAS,CAAC;QACzBC,IAAI,EAAE,OAAO;QACbC,KAAK,EAAER,cAAc,GAAG,eAAe,GAAG,eAAe;QACzDS,UAAU,EAAE;UACVC,OAAO,EAAGf,KAAK,EAAYe,OAAO,IAAI;QACxC;MACF,CAAC,CAAC;IACJ;EACF,CAAC;EAED,MAAMC,SAAS,GAAIC,GAAY,IAAK;IAClC,IAAIC,wCAAiB,CAACC,oBAAoB,CAAC,CAAC,IAAIF,GAAG,EAAE;MACnDC,wCAAiB,CAACE,eAAe,CAACH,GAAG,CAAC;MACtC3B,sCAAe,CAAC+B,WAAW,CAAC,aAAa,CAAC;IAC5C;EACF,CAAC;EAED,MAAMC,gBAAgB,GAAIC,GAAa,IAAK;IAC1C1C,WAAW,CAAC0C,GAAG,CAAC;EAClB,CAAC;EAED,IAAAC,sBAAe,EAAC,MAAM;IACpB,MAAMC,UAAsB,GAAG,EAAE;IACjC,IAAIzD,IAAI,EAAEQ,MAAM,EAAEkD,WAAW,EAAE;MAC7BD,UAAU,CAACE,IAAI,CAAC,QAAQ,CAAC;IAC3B;IACA,IAAI3D,IAAI,EAAEQ,MAAM,EAAEoD,WAAW,IAAI,CAACnD,WAAW,EAAE;MAC7CgD,UAAU,CAACE,IAAI,CAAC,KAAK,CAAC;IACxB;IAEA5C,YAAY,CAAC0C,UAAU,CAAC;IACxB5C,WAAW,CAAC4C,UAAU,CAAC,CAAC,CAAC,CAAC;EAC5B,CAAC,EAAE,CAACzD,IAAI,EAAES,WAAW,CAAC,CAAC;EAEvB,IAAAoD,gBAAS,EAAC,MAAM;IACdxC,oBAAoB,CAAC,CAAC;IACtB,IAAIyC,SAAyB;;IAE7B;IACA,IAAIvD,IAAI,EAAE;MACRuD,SAAS,GAAGC,WAAW,CAAC1C,oBAAoB,EAAE2C,oCAAa,CAACC,UAAU,CAAC;IACzE;IAEA,OAAO,MAAMC,aAAa,CAACJ,SAAS,CAAC;IACrC;EACF,CAAC,EAAE,CAACvD,IAAI,CAAC,CAAC;EAEV,oBACE,IAAAf,WAAA,CAAA2E,IAAA,EAAA3E,WAAA,CAAA4E,QAAA;IAAAC,QAAA,GACGvD,SAAS,CAACwD,MAAM,GAAG,CAAC,gBACnB,IAAA9E,WAAA,CAAA+E,GAAA,EAAChF,oBAAA,CAAAiF,gBAAgB;MAAC1D,SAAS,EAAEA,SAAU;MAACwC,gBAAgB,EAAEA;IAAiB,CAAE,CAAC,GAC5E,IAAI,EACP/C,IAAI,gBACH,IAAAf,WAAA,CAAA+E,GAAA,EAACnF,oBAAA,CAAAqF,gBAAgB,IAAE,CAAC,GAClB7D,QAAQ,KAAK,QAAQ,gBACvB,IAAApB,WAAA,CAAA+E,GAAA,EAAClF,oBAAA,CAAAqF,gBAAgB;MAAC1D,OAAO,EAAEA,OAAQ;MAACgC,SAAS,EAAEA,SAAU;MAACvC,WAAW,EAAEA;IAAY,CAAE,CAAC,GACpFG,QAAQ,KAAK,KAAK,gBACpB,IAAApB,WAAA,CAAA+E,GAAA,EAACjF,iBAAA,CAAAqF,aAAa;MAAC3B,SAAS,EAAEA;IAAU,CAAE,CAAC,GACrC,IAAI;EAAA,CACR,CAAC;AAEP","ignoreList":[]}
1
+ {"version":3,"names":["_valtio","require","_react","_appkitCommonReactNative","_appkitCoreReactNative","_AppKitContext","_w3mConnectingQrcode","_w3mConnectingMobile","_w3mConnectingWeb","_w3mConnectingHeader","_jsxRuntime","ConnectingView","connect","useInternalAppKit","installed","useSnapshot","ApiController","state","data","RouterController","lastRetryRef","useRef","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","useState","platforms","setPlatforms","onRetry","CoreHelperUtil","isAllowedRetry","current","initializeConnection","SnackController","showError","retry","wcPairingExpiry","WcController","routeData","isPairingExpired","setWcError","clearUri","connectPromise","setWcPromise","error","LogController","sendError","isUserRejected","ErrorUtil","isUserRejectedRequestError","isProposalExpired","isProposalExpiredError","EventsController","sendEvent","type","event","properties","message","onCopyUri","uri","OptionsController","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","useLayoutEffect","_platforms","mobile_link","push","webapp_link","useEffect","_interval","setInterval","ConstantsUtil","TEN_SEC_MS","clearInterval","jsxs","Fragment","children","length","jsx","ConnectingHeader","ConnectingQrCode","ConnectingMobile","ConnectingWeb"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":"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","ignoreList":[]}
package/lib/module/views/w3m-connecting-view/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  import { useSnapshot } from 'valtio';
4
- import { useEffect, useLayoutEffect, useState } from 'react';
4
+ import { useEffect, useLayoutEffect, useRef, useState } from 'react';
5
5
  import { ErrorUtil } from '@reown/appkit-common-react-native';
6
6
  import { WcController, ConstantsUtil, CoreHelperUtil, RouterController, SnackController, OptionsController, ApiController, EventsController, LogController } from '@reown/appkit-core-react-native';
7
7
  import { useInternalAppKit } from '../../AppKitContext';
@@ -20,21 +20,20 @@ export function ConnectingView() {
20
20
  const {
21
21
  data
22
22
  } = RouterController.state;
23
- const [lastRetry, setLastRetry] = useState(Date.now());
23
+ const lastRetryRef = useRef(Date.now());
24
24
  const isQr = !data?.wallet;
25
25
  const isInstalled = !!installed?.find(wallet => wallet.id === data?.wallet?.id);
26
26
  const [platform, setPlatform] = useState();
27
27
  const [platforms, setPlatforms] = useState([]);
28
28
  const onRetry = () => {
29
- if (CoreHelperUtil.isAllowedRetry(lastRetry)) {
30
- setLastRetry(Date.now());
31
- WcController.clearUri();
29
+ if (CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
30
+ lastRetryRef.current = Date.now();
32
31
  initializeConnection(true);
33
32
  } else {
34
33
  SnackController.showError('Please wait a second before retrying');
35
34
  }
36
35
  };
37
- const initializeConnection = async (retry = false, retryTimestamp) => {
36
+ const initializeConnection = async (retry = false) => {
38
37
  try {
39
38
  const {
40
39
  wcPairingExpiry
@@ -45,6 +44,7 @@ export function ConnectingView() {
45
44
  const isPairingExpired = CoreHelperUtil.isPairingExpired(wcPairingExpiry);
46
45
  if (retry || isPairingExpired) {
47
46
  WcController.setWcError(false);
47
+ WcController.clearUri();
48
48
  const connectPromise = connect({
49
49
  wallet: routeData?.wallet
50
50
  });
@@ -54,14 +54,6 @@ export function ConnectingView() {
54
54
  } catch (error) {
55
55
  LogController.sendError(error, 'ConnectingView.tsx', 'initializeConnection');
56
56
  WcController.setWcError(true);
57
- WcController.clearUri();
58
- const currentRetryTime = retryTimestamp ?? lastRetry;
59
- if (isQr && CoreHelperUtil.isAllowedRetry(currentRetryTime)) {
60
- const newRetryTime = Date.now();
61
- setLastRetry(newRetryTime);
62
- initializeConnection(true, newRetryTime);
63
- return;
64
- }
65
57
  const isUserRejected = ErrorUtil.isUserRejectedRequestError(error);
66
58
  const isProposalExpired = ErrorUtil.isProposalExpiredError(error);
67
59
  if (!isProposalExpired) {
@@ -74,6 +66,10 @@ export function ConnectingView() {
74
66
  message: error?.message ?? 'Unknown'
75
67
  }
76
68
  });
69
+ if (isQr && CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
70
+ lastRetryRef.current = Date.now();
71
+ initializeConnection(true);
72
+ }
77
73
  }
78
74
  };
79
75
  const onCopyUri = uri => {
@@ -97,7 +93,7 @@ export function ConnectingView() {
97
93
  setPlatform(_platforms[0]);
98
94
  }, [data, isInstalled]);
99
95
  useEffect(() => {
100
- initializeConnection();
96
+ initializeConnection(true);
101
97
  let _interval;
102
98
 
103
99
  // Check if the pairing expired every 10 seconds. If expired, it will create a new uri.
package/lib/module/views/w3m-connecting-view/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["useSnapshot","useEffect","useLayoutEffect","useState","ErrorUtil","WcController","ConstantsUtil","CoreHelperUtil","RouterController","SnackController","OptionsController","ApiController","EventsController","LogController","useInternalAppKit","ConnectingQrCode","ConnectingMobile","ConnectingWeb","ConnectingHeader","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ConnectingView","connect","installed","state","data","lastRetry","setLastRetry","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","isAllowedRetry","clearUri","initializeConnection","showError","retry","retryTimestamp","wcPairingExpiry","routeData","isPairingExpired","setWcError","connectPromise","setWcPromise","error","sendError","currentRetryTime","newRetryTime","isUserRejected","isUserRejectedRequestError","isProposalExpired","isProposalExpiredError","sendEvent","type","event","properties","message","onCopyUri","uri","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","_platforms","mobile_link","push","webapp_link","_interval","setInterval","TEN_SEC_MS","clearInterval","children","length"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,QAAQ;AACpC,SAASC,SAAS,EAAEC,eAAe,EAAEC,QAAQ,QAAQ,OAAO;AAC5D,SAASC,SAAS,QAAuB,mCAAmC;AAC5E,SACEC,YAAY,EACZC,aAAa,EACbC,cAAc,EACdC,gBAAgB,EAChBC,eAAe,EACfC,iBAAiB,EACjBC,aAAa,EACbC,gBAAgB,EAChBC,aAAa,QACR,iCAAiC;AACxC,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,aAAa,QAAQ,mCAAmC;AACjE,SAASC,gBAAgB,QAAQ,sCAAsC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAExE,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,MAAM;IAAEC;EAAQ,CAAC,GAAGZ,iBAAiB,CAAC,CAAC;EACvC,MAAM;IAAEa;EAAU,CAAC,GAAG3B,WAAW,CAACW,aAAa,CAACiB,KAAK,CAAC;EACtD,MAAM;IAAEC;EAAK,CAAC,GAAGrB,gBAAgB,CAACoB,KAAK;EACvC,MAAM,CAACE,SAAS,EAAEC,YAAY,CAAC,GAAG5B,QAAQ,CAAC6B,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,GAAGrC,QAAQ,CAAW,CAAC;EACpD,MAAM,CAACsC,SAAS,EAAEC,YAAY,CAAC,GAAGvC,QAAQ,CAAa,EAAE,CAAC;EAE1D,MAAMwC,OAAO,GAAGA,CAAA,KAAM;IACpB,IAAIpC,cAAc,CAACqC,cAAc,CAACd,SAAS,CAAC,EAAE;MAC5CC,YAAY,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,CAAC;MACxB5B,YAAY,CAACwC,QAAQ,CAAC,CAAC;MACvBC,oBAAoB,CAAC,IAAI,CAAC;IAC5B,CAAC,MAAM;MACLrC,eAAe,CAACsC,SAAS,CAAC,sCAAsC,CAAC;IACnE;EACF,CAAC;EAED,MAAMD,oBAAoB,GAAG,MAAAA,CAAOE,KAAK,GAAG,KAAK,EAAEC,cAAuB,KAAK;IAC7E,IAAI;MACF,MAAM;QAAEC;MAAgB,CAAC,GAAG7C,YAAY,CAACuB,KAAK;MAC9C,MAAM;QAAEC,IAAI,EAAEsB;MAAU,CAAC,GAAG3C,gBAAgB,CAACoB,KAAK;MAClD,MAAMwB,gBAAgB,GAAG7C,cAAc,CAAC6C,gBAAgB,CAACF,eAAe,CAAC;MACzE,IAAIF,KAAK,IAAII,gBAAgB,EAAE;QAC7B/C,YAAY,CAACgD,UAAU,CAAC,KAAK,CAAC;QAE9B,MAAMC,cAAc,GAAG5B,OAAO,CAAC;UAC7BS,MAAM,EAAEgB,SAAS,EAAEhB;QACrB,CAAC,CAAC;QACF9B,YAAY,CAACkD,YAAY,CAACD,cAAc,CAAC;QACzC,MAAMA,cAAc;MACtB;IACF,CAAC,CAAC,OAAOE,KAAK,EAAE;MACd3C,aAAa,CAAC4C,SAAS,CAACD,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,CAAC;MAC5EnD,YAAY,CAACgD,UAAU,CAAC,IAAI,CAAC;MAC7BhD,YAAY,CAACwC,QAAQ,CAAC,CAAC;MAEvB,MAAMa,gBAAgB,GAAGT,cAAc,IAAInB,SAAS;MAEpD,IAAII,IAAI,IAAI3B,cAAc,CAACqC,cAAc,CAACc,gBAAgB,CAAC,EAAE;QAC3D,MAAMC,YAAY,GAAG3B,IAAI,CAACC,GAAG,CAAC,CAAC;QAC/BF,YAAY,CAAC4B,YAAY,CAAC;QAC1Bb,oBAAoB,CAAC,IAAI,EAAEa,YAAY,CAAC;QAExC;MACF;MAEA,MAAMC,cAAc,GAAGxD,SAAS,CAACyD,0BAA0B,CAACL,KAAK,CAAC;MAClE,MAAMM,iBAAiB,GAAG1D,SAAS,CAAC2D,sBAAsB,CAACP,KAAK,CAAC;MACjE,IAAI,CAACM,iBAAiB,EAAE;QACtBrD,eAAe,CAACsC,SAAS,CACvBa,cAAc,GAAG,2BAA2B,GAAG,sBACjD,CAAC;MACH;MAEAhD,gBAAgB,CAACoD,SAAS,CAAC;QACzBC,IAAI,EAAE,OAAO;QACbC,KAAK,EAAEN,cAAc,GAAG,eAAe,GAAG,eAAe;QACzDO,UAAU,EAAE;UACVC,OAAO,EAAGZ,KAAK,EAAYY,OAAO,IAAI;QACxC;MACF,CAAC,CAAC;IACJ;EACF,CAAC;EAED,MAAMC,SAAS,GAAIC,GAAY,IAAK;IAClC,IAAI5D,iBAAiB,CAAC6D,oBAAoB,CAAC,CAAC,IAAID,GAAG,EAAE;MACnD5D,iBAAiB,CAAC8D,eAAe,CAACF,GAAG,CAAC;MACtC7D,eAAe,CAACgE,WAAW,CAAC,aAAa,CAAC;IAC5C;EACF,CAAC;EAED,MAAMC,gBAAgB,GAAIC,GAAa,IAAK;IAC1CnC,WAAW,CAACmC,GAAG,CAAC;EAClB,CAAC;EAEDzE,eAAe,CAAC,MAAM;IACpB,MAAM0E,UAAsB,GAAG,EAAE;IACjC,IAAI/C,IAAI,EAAEM,MAAM,EAAE0C,WAAW,EAAE;MAC7BD,UAAU,CAACE,IAAI,CAAC,QAAQ,CAAC;IAC3B;IACA,IAAIjD,IAAI,EAAEM,MAAM,EAAE4C,WAAW,IAAI,CAAC3C,WAAW,EAAE;MAC7CwC,UAAU,CAACE,IAAI,CAAC,KAAK,CAAC;IACxB;IAEApC,YAAY,CAACkC,UAAU,CAAC;IACxBpC,WAAW,CAACoC,UAAU,CAAC,CAAC,CAAC,CAAC;EAC5B,CAAC,EAAE,CAAC/C,IAAI,EAAEO,WAAW,CAAC,CAAC;EAEvBnC,SAAS,CAAC,MAAM;IACd6C,oBAAoB,CAAC,CAAC;IACtB,IAAIkC,SAAyB;;IAE7B;IACA,IAAI9C,IAAI,EAAE;MACR8C,SAAS,GAAGC,WAAW,CAACnC,oBAAoB,EAAExC,aAAa,CAAC4E,UAAU,CAAC;IACzE;IAEA,OAAO,MAAMC,aAAa,CAACH,SAAS,CAAC;IACrC;EACF,CAAC,EAAE,CAAC9C,IAAI,CAAC,CAAC;EAEV,oBACEV,KAAA,CAAAF,SAAA;IAAA8D,QAAA,GACG3C,SAAS,CAAC4C,MAAM,GAAG,CAAC,gBACnBjE,IAAA,CAACF,gBAAgB;MAACuB,SAAS,EAAEA,SAAU;MAACiC,gBAAgB,EAAEA;IAAiB,CAAE,CAAC,GAC5E,IAAI,EACPxC,IAAI,gBACHd,IAAA,CAACL,gBAAgB,IAAE,CAAC,GAClBwB,QAAQ,KAAK,QAAQ,gBACvBnB,IAAA,CAACJ,gBAAgB;MAAC2B,OAAO,EAAEA,OAAQ;MAAC0B,SAAS,EAAEA,SAAU;MAACjC,WAAW,EAAEA;IAAY,CAAE,CAAC,GACpFG,QAAQ,KAAK,KAAK,gBACpBnB,IAAA,CAACH,aAAa;MAACoD,SAAS,EAAEA;IAAU,CAAE,CAAC,GACrC,IAAI;EAAA,CACR,CAAC;AAEP","ignoreList":[]}
1
+ {"version":3,"names":["useSnapshot","useEffect","useLayoutEffect","useRef","useState","ErrorUtil","WcController","ConstantsUtil","CoreHelperUtil","RouterController","SnackController","OptionsController","ApiController","EventsController","LogController","useInternalAppKit","ConnectingQrCode","ConnectingMobile","ConnectingWeb","ConnectingHeader","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ConnectingView","connect","installed","state","data","lastRetryRef","Date","now","isQr","wallet","isInstalled","find","id","platform","setPlatform","platforms","setPlatforms","onRetry","isAllowedRetry","current","initializeConnection","showError","retry","wcPairingExpiry","routeData","isPairingExpired","setWcError","clearUri","connectPromise","setWcPromise","error","sendError","isUserRejected","isUserRejectedRequestError","isProposalExpired","isProposalExpiredError","sendEvent","type","event","properties","message","onCopyUri","uri","isClipboardAvailable","copyToClipboard","showSuccess","onSelectPlatform","tab","_platforms","mobile_link","push","webapp_link","_interval","setInterval","TEN_SEC_MS","clearInterval","children","length"],"sourceRoot":"../../../../src","sources":["views/w3m-connecting-view/index.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/views/w3m-connecting-view/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-connecting-view/index.tsx"],"names":[],"mappings":"AAoBA,wBAAgB,cAAc,4CAuH7B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-connecting-view/index.tsx"],"names":[],"mappings":"AAoBA,wBAAgB,cAAc,4CAiH7B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reown/appkit-react-native",
3
- "version": "0.0.0-develop-20251114152149",
3
+ "version": "0.0.0-develop-20251114183547",
4
4
  "main": "lib/commonjs/index.js",
5
5
  "types": "lib/typescript/index.d.ts",
6
6
  "module": "lib/module/index.js",
@@ -40,9 +40,9 @@
40
40
  "provenance": true
41
41
  },
42
42
  "dependencies": {
43
- "@reown/appkit-common-react-native": "0.0.0-develop-20251114152149",
44
- "@reown/appkit-core-react-native": "0.0.0-develop-20251114152149",
45
- "@reown/appkit-ui-react-native": "0.0.0-develop-20251114152149",
43
+ "@reown/appkit-common-react-native": "0.0.0-develop-20251114183547",
44
+ "@reown/appkit-core-react-native": "0.0.0-develop-20251114183547",
45
+ "@reown/appkit-ui-react-native": "0.0.0-develop-20251114183547",
46
46
  "@walletconnect/universal-provider": "2.21.10",
47
47
  "valtio": "2.1.8"
48
48
  },
package/src/views/w3m-connecting-view/index.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import { useSnapshot } from 'valtio';
2
- import { useEffect, useLayoutEffect, useState } from 'react';
2
+ import { useEffect, useLayoutEffect, useRef, useState } from 'react';
3
3
  import { ErrorUtil, type Platform } from '@reown/appkit-common-react-native';
4
4
  import {
5
5
  WcController,
@@ -22,7 +22,7 @@ export function ConnectingView() {
22
22
  const { connect } = useInternalAppKit();
23
23
  const { installed } = useSnapshot(ApiController.state);
24
24
  const { data } = RouterController.state;
25
- const [lastRetry, setLastRetry] = useState(Date.now());
25
+ const lastRetryRef = useRef<number>(Date.now());
26
26
  const isQr = !data?.wallet;
27
27
  const isInstalled = !!installed?.find(wallet => wallet.id === data?.wallet?.id);
28
28
 
@@ -30,22 +30,22 @@ export function ConnectingView() {
30
30
  const [platforms, setPlatforms] = useState<Platform[]>([]);
31
31
 
32
32
  const onRetry = () => {
33
- if (CoreHelperUtil.isAllowedRetry(lastRetry)) {
34
- setLastRetry(Date.now());
35
- WcController.clearUri();
33
+ if (CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
34
+ lastRetryRef.current = Date.now();
36
35
  initializeConnection(true);
37
36
  } else {
38
37
  SnackController.showError('Please wait a second before retrying');
39
38
  }
40
39
  };
41
40
 
42
- const initializeConnection = async (retry = false, retryTimestamp?: number) => {
41
+ const initializeConnection = async (retry = false) => {
43
42
  try {
44
43
  const { wcPairingExpiry } = WcController.state;
45
44
  const { data: routeData } = RouterController.state;
46
45
  const isPairingExpired = CoreHelperUtil.isPairingExpired(wcPairingExpiry);
47
46
  if (retry || isPairingExpired) {
48
47
  WcController.setWcError(false);
48
+ WcController.clearUri();
49
49
 
50
50
  const connectPromise = connect({
51
51
  wallet: routeData?.wallet
@@ -56,17 +56,6 @@ export function ConnectingView() {
56
56
  } catch (error) {
57
57
  LogController.sendError(error, 'ConnectingView.tsx', 'initializeConnection');
58
58
  WcController.setWcError(true);
59
- WcController.clearUri();
60
-
61
- const currentRetryTime = retryTimestamp ?? lastRetry;
62
-
63
- if (isQr && CoreHelperUtil.isAllowedRetry(currentRetryTime)) {
64
- const newRetryTime = Date.now();
65
- setLastRetry(newRetryTime);
66
- initializeConnection(true, newRetryTime);
67
-
68
- return;
69
- }
70
59
 
71
60
  const isUserRejected = ErrorUtil.isUserRejectedRequestError(error);
72
61
  const isProposalExpired = ErrorUtil.isProposalExpiredError(error);
@@ -83,6 +72,11 @@ export function ConnectingView() {
83
72
  message: (error as Error)?.message ?? 'Unknown'
84
73
  }
85
74
  });
75
+
76
+ if (isQr && CoreHelperUtil.isAllowedRetry(lastRetryRef.current)) {
77
+ lastRetryRef.current = Date.now();
78
+ initializeConnection(true);
79
+ }
86
80
  }
87
81
  };
88
82
 
@@ -111,7 +105,7 @@ export function ConnectingView() {
111
105
  }, [data, isInstalled]);
112
106
 
113
107
  useEffect(() => {
114
- initializeConnection();
108
+ initializeConnection(true);
115
109
  let _interval: NodeJS.Timeout;
116
110
 
117
111
  // Check if the pairing expired every 10 seconds. If expired, it will create a new uri.