@reown/appkit-core-react-native 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250523185010 → 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526162614

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 (15) hide show
  1. package/lib/commonjs/utils/NetworkUtil.js +12 -6
  2. package/lib/commonjs/utils/NetworkUtil.js.map +1 -1
  3. package/lib/commonjs/utils/RouterUtil.js +3 -21
  4. package/lib/commonjs/utils/RouterUtil.js.map +1 -1
  5. package/lib/module/utils/NetworkUtil.js +12 -6
  6. package/lib/module/utils/NetworkUtil.js.map +1 -1
  7. package/lib/module/utils/RouterUtil.js +3 -21
  8. package/lib/module/utils/RouterUtil.js.map +1 -1
  9. package/lib/typescript/utils/NetworkUtil.d.ts +1 -1
  10. package/lib/typescript/utils/NetworkUtil.d.ts.map +1 -1
  11. package/lib/typescript/utils/RouterUtil.d.ts +1 -2
  12. package/lib/typescript/utils/RouterUtil.d.ts.map +1 -1
  13. package/package.json +2 -2
  14. package/src/utils/NetworkUtil.ts +10 -4
  15. package/src/utils/RouterUtil.ts +4 -21
package/lib/commonjs/utils/NetworkUtil.js CHANGED
@@ -11,7 +11,7 @@ var _AccountController = require("../controllers/AccountController");
11
11
  var _ConnectorController = require("../controllers/ConnectorController");
12
12
  var _SwapController = require("../controllers/SwapController");
13
13
  const NetworkUtil = exports.NetworkUtil = {
14
- async handleNetworkSwitch(network) {
14
+ async handleNetworkSwitch(network, navigate = true) {
15
15
  const {
16
16
  isConnected
17
17
  } = _AccountController.AccountController.state;
@@ -25,19 +25,25 @@ const NetworkUtil = exports.NetworkUtil = {
25
25
  if (isConnected && caipNetwork?.id !== network.id) {
26
26
  if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
27
27
  await _NetworkController.NetworkController.switchActiveNetwork(network);
28
- _RouterUtil.RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
28
+ if (navigate) {
29
+ _RouterUtil.RouterUtil.goBackOrCloseModal();
30
+ }
29
31
  eventData = {
30
32
  type: 'SWITCH_NETWORK',
31
33
  networkId: network.id
32
34
  };
33
35
  } else if (supportsAllNetworks || isAuthConnector) {
34
- _RouterController.RouterController.push('SwitchNetwork', {
35
- network
36
- });
36
+ if (navigate) {
37
+ _RouterController.RouterController.push('SwitchNetwork', {
38
+ network
39
+ });
40
+ }
37
41
  }
38
42
  } else if (!isConnected) {
39
43
  _NetworkController.NetworkController.setCaipNetwork(network);
40
- _RouterController.RouterController.push('Connect');
44
+ if (navigate) {
45
+ _RouterController.RouterController.push('Connect');
46
+ }
41
47
  }
42
48
  _SwapController.SwapController.resetState();
43
49
  return eventData;
package/lib/commonjs/utils/NetworkUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_RouterUtil","require","_RouterController","_NetworkController","_AccountController","_ConnectorController","_SwapController","NetworkUtil","exports","handleNetworkSwitch","network","isConnected","AccountController","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","NetworkController","isAuthConnector","ConnectorController","connectedConnector","eventData","id","includes","switchActiveNetwork","RouterUtil","navigateAfterNetworkSwitch","type","networkId","RouterController","push","setCaipNetwork","SwapController","resetState"],"sourceRoot":"../../../src","sources":["utils/NetworkUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AACA,IAAAI,oBAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AAGO,MAAMM,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG;EACzB,MAAME,mBAAmBA,CAACC,OAAoB,EAAE;IAC9C,MAAM;MAAEC;IAAY,CAAC,GAAGC,oCAAiB,CAACC,KAAK;IAC/C,MAAM;MAAEC,WAAW;MAAEC,sBAAsB;MAAEC;IAAoB,CAAC,GAAGC,oCAAiB,CAACJ,KAAK;IAC5F,MAAMK,eAAe,GAAGC,wCAAmB,CAACN,KAAK,CAACO,kBAAkB,KAAK,MAAM;IAC/E,IAAIC,SAAS,GAAG,IAAI;IAEpB,IAAIV,WAAW,IAAIG,WAAW,EAAEQ,EAAE,KAAKZ,OAAO,CAACY,EAAE,EAAE;MACjD,IAAIP,sBAAsB,EAAEQ,QAAQ,CAACb,OAAO,CAACY,EAAE,CAAC,IAAI,CAACJ,eAAe,EAAE;QACpE,MAAMD,oCAAiB,CAACO,mBAAmB,CAACd,OAAO,CAAC;QACpDe,sBAAU,CAACC,0BAA0B,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACzDL,SAAS,GAAG;UAAEM,IAAI,EAAE,gBAAgB;UAAEC,SAAS,EAAElB,OAAO,CAACY;QAAG,CAAC;MAC/D,CAAC,MAAM,IAAIN,mBAAmB,IAAIE,eAAe,EAAE;QACjDW,kCAAgB,CAACC,IAAI,CAAC,eAAe,EAAE;UAAEpB;QAAQ,CAAC,CAAC;MACrD;IACF,CAAC,MAAM,IAAI,CAACC,WAAW,EAAE;MACvBM,oCAAiB,CAACc,cAAc,CAACrB,OAAO,CAAC;MACzCmB,kCAAgB,CAACC,IAAI,CAAC,SAAS,CAAC;IAClC;IAEAE,8BAAc,CAACC,UAAU,CAAC,CAAC;IAE3B,OAAOZ,SAAS;EAClB;AACF,CAAC"}
1
+ {"version":3,"names":["_RouterUtil","require","_RouterController","_NetworkController","_AccountController","_ConnectorController","_SwapController","NetworkUtil","exports","handleNetworkSwitch","network","navigate","isConnected","AccountController","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","NetworkController","isAuthConnector","ConnectorController","connectedConnector","eventData","id","includes","switchActiveNetwork","RouterUtil","goBackOrCloseModal","type","networkId","RouterController","push","setCaipNetwork","SwapController","resetState"],"sourceRoot":"../../../src","sources":["utils/NetworkUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AACA,IAAAI,oBAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AAGO,MAAMM,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG;EACzB,MAAME,mBAAmBA,CAACC,OAAoB,EAAEC,QAAQ,GAAG,IAAI,EAAE;IAC/D,MAAM;MAAEC;IAAY,CAAC,GAAGC,oCAAiB,CAACC,KAAK;IAC/C,MAAM;MAAEC,WAAW;MAAEC,sBAAsB;MAAEC;IAAoB,CAAC,GAAGC,oCAAiB,CAACJ,KAAK;IAC5F,MAAMK,eAAe,GAAGC,wCAAmB,CAACN,KAAK,CAACO,kBAAkB,KAAK,MAAM;IAC/E,IAAIC,SAAS,GAAG,IAAI;IAEpB,IAAIV,WAAW,IAAIG,WAAW,EAAEQ,EAAE,KAAKb,OAAO,CAACa,EAAE,EAAE;MACjD,IAAIP,sBAAsB,EAAEQ,QAAQ,CAACd,OAAO,CAACa,EAAE,CAAC,IAAI,CAACJ,eAAe,EAAE;QACpE,MAAMD,oCAAiB,CAACO,mBAAmB,CAACf,OAAO,CAAC;QACpD,IAAIC,QAAQ,EAAE;UACZe,sBAAU,CAACC,kBAAkB,CAAC,CAAC;QACjC;QACAL,SAAS,GAAG;UAAEM,IAAI,EAAE,gBAAgB;UAAEC,SAAS,EAAEnB,OAAO,CAACa;QAAG,CAAC;MAC/D,CAAC,MAAM,IAAIN,mBAAmB,IAAIE,eAAe,EAAE;QACjD,IAAIR,QAAQ,EAAE;UACZmB,kCAAgB,CAACC,IAAI,CAAC,eAAe,EAAE;YAAErB;UAAQ,CAAC,CAAC;QACrD;MACF;IACF,CAAC,MAAM,IAAI,CAACE,WAAW,EAAE;MACvBM,oCAAiB,CAACc,cAAc,CAACtB,OAAO,CAAC;MACzC,IAAIC,QAAQ,EAAE;QACZmB,kCAAgB,CAACC,IAAI,CAAC,SAAS,CAAC;MAClC;IACF;IAEAE,8BAAc,CAACC,UAAU,CAAC,CAAC;IAE3B,OAAOZ,SAAS;EAClB;AACF,CAAC"}
package/lib/commonjs/utils/RouterUtil.js CHANGED
@@ -7,27 +7,9 @@ exports.RouterUtil = void 0;
7
7
  var _RouterController = require("../controllers/RouterController");
8
8
  var _ModalController = require("../controllers/ModalController");
9
9
  const RouterUtil = exports.RouterUtil = {
10
- navigateAfterNetworkSwitch(excludeViews = []) {
11
- if (excludeViews.includes(_RouterController.RouterController.state.view)) {
12
- return;
13
- }
14
- const {
15
- history
16
- } = _RouterController.RouterController.state;
17
-
18
- // Find the last occurrence of 'Networks' or 'UnsupportedChain'
19
- let lastNetworkViewIndex = -1;
20
- for (let i = history.length - 1; i >= 0; i--) {
21
- if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
22
- lastNetworkViewIndex = i;
23
- break;
24
- }
25
- }
26
-
27
- // Case 1: Navigated from a network selection view deeper in the app
28
- if (lastNetworkViewIndex > 0) {
29
- // Go to the view right before the network selection
30
- _RouterController.RouterController.goBackToIndex(lastNetworkViewIndex - 1);
10
+ goBackOrCloseModal() {
11
+ if (_RouterController.RouterController.state.history.length > 1) {
12
+ _RouterController.RouterController.goBack();
31
13
  } else {
32
14
  _ModalController.ModalController.close();
33
15
  }
package/lib/commonjs/utils/RouterUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_RouterController","require","_ModalController","RouterUtil","exports","navigateAfterNetworkSwitch","excludeViews","includes","RouterController","state","view","history","lastNetworkViewIndex","i","length","goBackToIndex","ModalController","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBE,0BAA0BA,CAACC,YAA6C,GAAG,EAAE,EAAE;IAC7E,IAAIA,YAAY,CAACC,QAAQ,CAACC,kCAAgB,CAACC,KAAK,CAACC,IAAI,CAAC,EAAE;MACtD;IACF;IAEA,MAAM;MAAEC;IAAQ,CAAC,GAAGH,kCAAgB,CAACC,KAAK;;IAE1C;IACA,IAAIG,oBAAoB,GAAG,CAAC,CAAC;IAC7B,KAAK,IAAIC,CAAC,GAAGF,OAAO,CAACG,MAAM,GAAG,CAAC,EAAED,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MAC5C,IAAIF,OAAO,CAACE,CAAC,CAAC,KAAK,UAAU,IAAIF,OAAO,CAACE,CAAC,CAAC,KAAK,kBAAkB,EAAE;QAClED,oBAAoB,GAAGC,CAAC;QACxB;MACF;IACF;;IAEA;IACA,IAAID,oBAAoB,GAAG,CAAC,EAAE;MAC5B;MACAJ,kCAAgB,CAACO,aAAa,CAACH,oBAAoB,GAAG,CAAC,CAAC;IAC1D,CAAC,MAAM;MACLI,gCAAe,CAACC,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC"}
1
+ {"version":3,"names":["_RouterController","require","_ModalController","RouterUtil","exports","goBackOrCloseModal","RouterController","state","history","length","goBack","ModalController","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBE,kBAAkBA,CAAA,EAAG;IACnB,IAAIC,kCAAgB,CAACC,KAAK,CAACC,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;MAC7CH,kCAAgB,CAACI,MAAM,CAAC,CAAC;IAC3B,CAAC,MAAM;MACLC,gCAAe,CAACC,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC"}
package/lib/module/utils/NetworkUtil.js CHANGED
@@ -5,7 +5,7 @@ import { AccountController } from '../controllers/AccountController';
5
5
  import { ConnectorController } from '../controllers/ConnectorController';
6
6
  import { SwapController } from '../controllers/SwapController';
7
7
  export const NetworkUtil = {
8
- async handleNetworkSwitch(network) {
8
+ async handleNetworkSwitch(network, navigate = true) {
9
9
  const {
10
10
  isConnected
11
11
  } = AccountController.state;
@@ -19,19 +19,25 @@ export const NetworkUtil = {
19
19
  if (isConnected && caipNetwork?.id !== network.id) {
20
20
  if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
21
21
  await NetworkController.switchActiveNetwork(network);
22
- RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
22
+ if (navigate) {
23
+ RouterUtil.goBackOrCloseModal();
24
+ }
23
25
  eventData = {
24
26
  type: 'SWITCH_NETWORK',
25
27
  networkId: network.id
26
28
  };
27
29
  } else if (supportsAllNetworks || isAuthConnector) {
28
- RouterController.push('SwitchNetwork', {
29
- network
30
- });
30
+ if (navigate) {
31
+ RouterController.push('SwitchNetwork', {
32
+ network
33
+ });
34
+ }
31
35
  }
32
36
  } else if (!isConnected) {
33
37
  NetworkController.setCaipNetwork(network);
34
- RouterController.push('Connect');
38
+ if (navigate) {
39
+ RouterController.push('Connect');
40
+ }
35
41
  }
36
42
  SwapController.resetState();
37
43
  return eventData;
package/lib/module/utils/NetworkUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["RouterUtil","RouterController","NetworkController","AccountController","ConnectorController","SwapController","NetworkUtil","handleNetworkSwitch","network","isConnected","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","isAuthConnector","connectedConnector","eventData","id","includes","switchActiveNetwork","navigateAfterNetworkSwitch","type","networkId","push","setCaipNetwork","resetState"],"sourceRoot":"../../../src","sources":["utils/NetworkUtil.ts"],"mappings":"AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,iBAAiB,QAAQ,kCAAkC;AACpE,SAASC,iBAAiB,QAAQ,kCAAkC;AACpE,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,+BAA+B;AAG9D,OAAO,MAAMC,WAAW,GAAG;EACzB,MAAMC,mBAAmBA,CAACC,OAAoB,EAAE;IAC9C,MAAM;MAAEC;IAAY,CAAC,GAAGN,iBAAiB,CAACO,KAAK;IAC/C,MAAM;MAAEC,WAAW;MAAEC,sBAAsB;MAAEC;IAAoB,CAAC,GAAGX,iBAAiB,CAACQ,KAAK;IAC5F,MAAMI,eAAe,GAAGV,mBAAmB,CAACM,KAAK,CAACK,kBAAkB,KAAK,MAAM;IAC/E,IAAIC,SAAS,GAAG,IAAI;IAEpB,IAAIP,WAAW,IAAIE,WAAW,EAAEM,EAAE,KAAKT,OAAO,CAACS,EAAE,EAAE;MACjD,IAAIL,sBAAsB,EAAEM,QAAQ,CAACV,OAAO,CAACS,EAAE,CAAC,IAAI,CAACH,eAAe,EAAE;QACpE,MAAMZ,iBAAiB,CAACiB,mBAAmB,CAACX,OAAO,CAAC;QACpDR,UAAU,CAACoB,0BAA0B,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACzDJ,SAAS,GAAG;UAAEK,IAAI,EAAE,gBAAgB;UAAEC,SAAS,EAAEd,OAAO,CAACS;QAAG,CAAC;MAC/D,CAAC,MAAM,IAAIJ,mBAAmB,IAAIC,eAAe,EAAE;QACjDb,gBAAgB,CAACsB,IAAI,CAAC,eAAe,EAAE;UAAEf;QAAQ,CAAC,CAAC;MACrD;IACF,CAAC,MAAM,IAAI,CAACC,WAAW,EAAE;MACvBP,iBAAiB,CAACsB,cAAc,CAAChB,OAAO,CAAC;MACzCP,gBAAgB,CAACsB,IAAI,CAAC,SAAS,CAAC;IAClC;IAEAlB,cAAc,CAACoB,UAAU,CAAC,CAAC;IAE3B,OAAOT,SAAS;EAClB;AACF,CAAC"}
1
+ {"version":3,"names":["RouterUtil","RouterController","NetworkController","AccountController","ConnectorController","SwapController","NetworkUtil","handleNetworkSwitch","network","navigate","isConnected","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","isAuthConnector","connectedConnector","eventData","id","includes","switchActiveNetwork","goBackOrCloseModal","type","networkId","push","setCaipNetwork","resetState"],"sourceRoot":"../../../src","sources":["utils/NetworkUtil.ts"],"mappings":"AAAA,SAASA,UAAU,QAAQ,cAAc;AACzC,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,iBAAiB,QAAQ,kCAAkC;AACpE,SAASC,iBAAiB,QAAQ,kCAAkC;AACpE,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,+BAA+B;AAG9D,OAAO,MAAMC,WAAW,GAAG;EACzB,MAAMC,mBAAmBA,CAACC,OAAoB,EAAEC,QAAQ,GAAG,IAAI,EAAE;IAC/D,MAAM;MAAEC;IAAY,CAAC,GAAGP,iBAAiB,CAACQ,KAAK;IAC/C,MAAM;MAAEC,WAAW;MAAEC,sBAAsB;MAAEC;IAAoB,CAAC,GAAGZ,iBAAiB,CAACS,KAAK;IAC5F,MAAMI,eAAe,GAAGX,mBAAmB,CAACO,KAAK,CAACK,kBAAkB,KAAK,MAAM;IAC/E,IAAIC,SAAS,GAAG,IAAI;IAEpB,IAAIP,WAAW,IAAIE,WAAW,EAAEM,EAAE,KAAKV,OAAO,CAACU,EAAE,EAAE;MACjD,IAAIL,sBAAsB,EAAEM,QAAQ,CAACX,OAAO,CAACU,EAAE,CAAC,IAAI,CAACH,eAAe,EAAE;QACpE,MAAMb,iBAAiB,CAACkB,mBAAmB,CAACZ,OAAO,CAAC;QACpD,IAAIC,QAAQ,EAAE;UACZT,UAAU,CAACqB,kBAAkB,CAAC,CAAC;QACjC;QACAJ,SAAS,GAAG;UAAEK,IAAI,EAAE,gBAAgB;UAAEC,SAAS,EAAEf,OAAO,CAACU;QAAG,CAAC;MAC/D,CAAC,MAAM,IAAIJ,mBAAmB,IAAIC,eAAe,EAAE;QACjD,IAAIN,QAAQ,EAAE;UACZR,gBAAgB,CAACuB,IAAI,CAAC,eAAe,EAAE;YAAEhB;UAAQ,CAAC,CAAC;QACrD;MACF;IACF,CAAC,MAAM,IAAI,CAACE,WAAW,EAAE;MACvBR,iBAAiB,CAACuB,cAAc,CAACjB,OAAO,CAAC;MACzC,IAAIC,QAAQ,EAAE;QACZR,gBAAgB,CAACuB,IAAI,CAAC,SAAS,CAAC;MAClC;IACF;IAEAnB,cAAc,CAACqB,UAAU,CAAC,CAAC;IAE3B,OAAOT,SAAS;EAClB;AACF,CAAC"}
package/lib/module/utils/RouterUtil.js CHANGED
@@ -1,27 +1,9 @@
1
1
  import { RouterController } from '../controllers/RouterController';
2
2
  import { ModalController } from '../controllers/ModalController';
3
3
  export const RouterUtil = {
4
- navigateAfterNetworkSwitch(excludeViews = []) {
5
- if (excludeViews.includes(RouterController.state.view)) {
6
- return;
7
- }
8
- const {
9
- history
10
- } = RouterController.state;
11
-
12
- // Find the last occurrence of 'Networks' or 'UnsupportedChain'
13
- let lastNetworkViewIndex = -1;
14
- for (let i = history.length - 1; i >= 0; i--) {
15
- if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
16
- lastNetworkViewIndex = i;
17
- break;
18
- }
19
- }
20
-
21
- // Case 1: Navigated from a network selection view deeper in the app
22
- if (lastNetworkViewIndex > 0) {
23
- // Go to the view right before the network selection
24
- RouterController.goBackToIndex(lastNetworkViewIndex - 1);
4
+ goBackOrCloseModal() {
5
+ if (RouterController.state.history.length > 1) {
6
+ RouterController.goBack();
25
7
  } else {
26
8
  ModalController.close();
27
9
  }
package/lib/module/utils/RouterUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["RouterController","ModalController","RouterUtil","navigateAfterNetworkSwitch","excludeViews","includes","state","view","history","lastNetworkViewIndex","i","length","goBackToIndex","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":"AAAA,SAASA,gBAAgB,QAAoC,iCAAiC;AAC9F,SAASC,eAAe,QAAQ,gCAAgC;AAEhE,OAAO,MAAMC,UAAU,GAAG;EACxBC,0BAA0BA,CAACC,YAA6C,GAAG,EAAE,EAAE;IAC7E,IAAIA,YAAY,CAACC,QAAQ,CAACL,gBAAgB,CAACM,KAAK,CAACC,IAAI,CAAC,EAAE;MACtD;IACF;IAEA,MAAM;MAAEC;IAAQ,CAAC,GAAGR,gBAAgB,CAACM,KAAK;;IAE1C;IACA,IAAIG,oBAAoB,GAAG,CAAC,CAAC;IAC7B,KAAK,IAAIC,CAAC,GAAGF,OAAO,CAACG,MAAM,GAAG,CAAC,EAAED,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MAC5C,IAAIF,OAAO,CAACE,CAAC,CAAC,KAAK,UAAU,IAAIF,OAAO,CAACE,CAAC,CAAC,KAAK,kBAAkB,EAAE;QAClED,oBAAoB,GAAGC,CAAC;QACxB;MACF;IACF;;IAEA;IACA,IAAID,oBAAoB,GAAG,CAAC,EAAE;MAC5B;MACAT,gBAAgB,CAACY,aAAa,CAACH,oBAAoB,GAAG,CAAC,CAAC;IAC1D,CAAC,MAAM;MACLR,eAAe,CAACY,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC"}
1
+ {"version":3,"names":["RouterController","ModalController","RouterUtil","goBackOrCloseModal","state","history","length","goBack","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,eAAe,QAAQ,gCAAgC;AAEhE,OAAO,MAAMC,UAAU,GAAG;EACxBC,kBAAkBA,CAAA,EAAG;IACnB,IAAIH,gBAAgB,CAACI,KAAK,CAACC,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;MAC7CN,gBAAgB,CAACO,MAAM,CAAC,CAAC;IAC3B,CAAC,MAAM;MACLN,eAAe,CAACO,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC"}
package/lib/typescript/utils/NetworkUtil.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { CaipNetwork } from '../utils/TypeUtil';
2
2
  export declare const NetworkUtil: {
3
- handleNetworkSwitch(network: CaipNetwork): Promise<{
3
+ handleNetworkSwitch(network: CaipNetwork, navigate?: boolean): Promise<{
4
4
  type: string;
5
5
  networkId: `${string}:${string}`;
6
6
  } | null>;
package/lib/typescript/utils/NetworkUtil.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NetworkUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/NetworkUtil.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,WAAW;iCACa,WAAW;;;;CAuB/C,CAAC"}
1
+ {"version":3,"file":"NetworkUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/NetworkUtil.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,WAAW;iCACa,WAAW;;;;CA6B/C,CAAC"}
package/lib/typescript/utils/RouterUtil.d.ts CHANGED
@@ -1,5 +1,4 @@
1
- import { type RouterControllerState } from '../controllers/RouterController';
2
1
  export declare const RouterUtil: {
3
- navigateAfterNetworkSwitch(excludeViews?: RouterControllerState['view'][]): void;
2
+ goBackOrCloseModal(): void;
4
3
  };
5
4
  //# sourceMappingURL=RouterUtil.d.ts.map
package/lib/typescript/utils/RouterUtil.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RouterUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/RouterUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAG/F,eAAO,MAAM,UAAU;8CACoB,qBAAqB,CAAC,MAAM,CAAC,EAAE;CAwBzE,CAAC"}
1
+ {"version":3,"file":"RouterUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/RouterUtil.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,UAAU;;CAQtB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reown/appkit-core-react-native",
3
- "version": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250523185010",
3
+ "version": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526162614",
4
4
  "main": "lib/commonjs/index.js",
5
5
  "types": "lib/typescript/index.d.ts",
6
6
  "module": "lib/module/index.js",
@@ -38,7 +38,7 @@
38
38
  "access": "public"
39
39
  },
40
40
  "dependencies": {
41
- "@reown/appkit-common-react-native": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250523185010",
41
+ "@reown/appkit-common-react-native": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526162614",
42
42
  "valtio": "1.11.2"
43
43
  },
44
44
  "peerDependencies": {
package/src/utils/NetworkUtil.ts CHANGED
@@ -7,7 +7,7 @@ import { SwapController } from '../controllers/SwapController';
7
7
  import type { CaipNetwork } from '../utils/TypeUtil';
8
8
 
9
9
  export const NetworkUtil = {
10
- async handleNetworkSwitch(network: CaipNetwork) {
10
+ async handleNetworkSwitch(network: CaipNetwork, navigate = true) {
11
11
  const { isConnected } = AccountController.state;
12
12
  const { caipNetwork, approvedCaipNetworkIds, supportsAllNetworks } = NetworkController.state;
13
13
  const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
@@ -16,14 +16,20 @@ export const NetworkUtil = {
16
16
  if (isConnected && caipNetwork?.id !== network.id) {
17
17
  if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
18
18
  await NetworkController.switchActiveNetwork(network);
19
- RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
19
+ if (navigate) {
20
+ RouterUtil.goBackOrCloseModal();
21
+ }
20
22
  eventData = { type: 'SWITCH_NETWORK', networkId: network.id };
21
23
  } else if (supportsAllNetworks || isAuthConnector) {
22
- RouterController.push('SwitchNetwork', { network });
24
+ if (navigate) {
25
+ RouterController.push('SwitchNetwork', { network });
26
+ }
23
27
  }
24
28
  } else if (!isConnected) {
25
29
  NetworkController.setCaipNetwork(network);
26
- RouterController.push('Connect');
30
+ if (navigate) {
31
+ RouterController.push('Connect');
32
+ }
27
33
  }
28
34
 
29
35
  SwapController.resetState();
package/src/utils/RouterUtil.ts CHANGED
@@ -1,27 +1,10 @@
1
- import { RouterController, type RouterControllerState } from '../controllers/RouterController';
1
+ import { RouterController } from '../controllers/RouterController';
2
2
  import { ModalController } from '../controllers/ModalController';
3
3
 
4
4
  export const RouterUtil = {
5
- navigateAfterNetworkSwitch(excludeViews: RouterControllerState['view'][] = []) {
6
- if (excludeViews.includes(RouterController.state.view)) {
7
- return;
8
- }
9
-
10
- const { history } = RouterController.state;
11
-
12
- // Find the last occurrence of 'Networks' or 'UnsupportedChain'
13
- let lastNetworkViewIndex = -1;
14
- for (let i = history.length - 1; i >= 0; i--) {
15
- if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
16
- lastNetworkViewIndex = i;
17
- break;
18
- }
19
- }
20
-
21
- // Case 1: Navigated from a network selection view deeper in the app
22
- if (lastNetworkViewIndex > 0) {
23
- // Go to the view right before the network selection
24
- RouterController.goBackToIndex(lastNetworkViewIndex - 1);
5
+ goBackOrCloseModal() {
6
+ if (RouterController.state.history.length > 1) {
7
+ RouterController.goBack();
25
8
  } else {
26
9
  ModalController.close();
27
10
  }