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

package/lib/commonjs/controllers/NetworkController.js

@@ -65,7 +65,8 @@ const NetworkController = exports.NetworkController = {
     state.approvedCaipNetworkIds = data.approvedCaipNetworkIds;
   },
   getApprovedCaipNetworks() {
-    return state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
+    const networks = state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
+    return networks ?? [];
   },
   getSmartAccountEnabledNetworks() {
     return this.getApprovedCaipNetworks().filter(network => state.smartAccountEnabledNetworks?.find(networkId => network.id === `eip155:${networkId}`));

package/lib/commonjs/controllers/NetworkController.js.map

@@ -1 +1 @@
-{"version":3,"names":["_valtio","require","_PublicStateController","_appkitCommonReactNative","_ConstantsUtil","state","proxy","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","isUnsupportedNetwork","NetworkController","exports","_getClient","_client","Error","setClient","client","ref","setCaipNetwork","caipNetwork","PublicStateController","set","selectedNetworkId","id","setDefaultCaipNetwork","setUnsupportedNetwork","setRequestedCaipNetworks","requestedNetworks","requestedCaipNetworks","setSmartAccountEnabledNetworks","checkIfSmartAccountEnabled","networkId","NetworkUtil","caipNetworkIdToNumber","Boolean","includes","Number","getApprovedCaipNetworksData","data","approvedCaipNetworkIds","getApprovedCaipNetworks","map","find","network","filter","getSmartAccountEnabledNetworks","getActiveNetworkTokenAddress","chainId","address","ConstantsUtil","NATIVE_TOKEN_ADDRESS","switchActiveNetwork","switchCaipNetwork","resetNetwork"],"sourceRoot":"../../../src","sources":["controllers/NetworkController.ts"],"mappings":"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"}
+{"version":3,"names":["_valtio","require","_PublicStateController","_appkitCommonReactNative","_ConstantsUtil","state","proxy","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","isUnsupportedNetwork","NetworkController","exports","_getClient","_client","Error","setClient","client","ref","setCaipNetwork","caipNetwork","PublicStateController","set","selectedNetworkId","id","setDefaultCaipNetwork","setUnsupportedNetwork","setRequestedCaipNetworks","requestedNetworks","requestedCaipNetworks","setSmartAccountEnabledNetworks","checkIfSmartAccountEnabled","networkId","NetworkUtil","caipNetworkIdToNumber","Boolean","includes","Number","getApprovedCaipNetworksData","data","approvedCaipNetworkIds","getApprovedCaipNetworks","networks","map","find","network","filter","getSmartAccountEnabledNetworks","getActiveNetworkTokenAddress","chainId","address","ConstantsUtil","NATIVE_TOKEN_ADDRESS","switchActiveNetwork","switchCaipNetwork","resetNetwork"],"sourceRoot":"../../../src","sources":["controllers/NetworkController.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAEA;;AAoBA;AACA,MAAMI,KAAK,GAAG,IAAAC,aAAK,EAAyB;EAC1CC,mBAAmB,EAAE,IAAI;EACzBC,kBAAkB,EAAEC,SAAS;EAC7BC,2BAA2B,EAAE,EAAE;EAC/BC,oBAAoB,EAAE;AACxB,CAAC,CAAC;;AAEF;AACO,MAAMC,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAAG;EAC/BP,KAAK;EAELS,UAAUA,CAAA,EAAG;IACX,IAAI,CAACT,KAAK,CAACU,OAAO,EAAE;MAClB,MAAM,IAAIC,KAAK,CAAC,kCAAkC,CAAC;IACrD;IAEA,OAAOX,KAAK,CAACU,OAAO;EACtB,CAAC;EAEDE,SAASA,CAACC,MAA+B,EAAE;IACzCb,KAAK,CAACU,OAAO,GAAG,IAAAI,WAAG,EAACD,MAAM,CAAC;EAC7B,CAAC;EAEDE,cAAcA,CAACC,WAAkD,EAAE;IACjEhB,KAAK,CAACgB,WAAW,GAAGA,WAAW;IAC/BC,4CAAqB,CAACC,GAAG,CAAC;MAAEC,iBAAiB,EAAEH,WAAW,EAAEI;IAAG,CAAC,CAAC;EACnE,CAAC;EAEDC,qBAAqBA,CAACL,WAAkD,EAAE;IACxEhB,KAAK,CAACgB,WAAW,GAAGA,WAAW;IAC/BhB,KAAK,CAACG,kBAAkB,GAAGa,WAAW;IACtCC,4CAAqB,CAACC,GAAG,CAAC;MAAEC,iBAAiB,EAAEH,WAAW,EAAEI;IAAG,CAAC,CAAC;EACnE,CAAC;EAEDE,qBAAqBA,CAAChB,oBAAoE,EAAE;IAC1FN,KAAK,CAACM,oBAAoB,GAAGA,oBAAoB;EACnD,CAAC;EAEDiB,wBAAwBA,CAACC,iBAAkE,EAAE;IAC3FxB,KAAK,CAACyB,qBAAqB,GAAGD,iBAAiB;EACjD,CAAC;EAEDE,8BAA8BA,CAC5BrB,2BAAkF,EAClF;IACAL,KAAK,CAACK,2BAA2B,GAAGA,2BAA2B;EACjE,CAAC;EAEDsB,0BAA0BA,CAAA,EAAG;IAC3B,MAAMC,SAAS,GAAGC,oCAAW,CAACC,qBAAqB,CAAC9B,KAAK,CAACgB,WAAW,EAAEI,EAAE,CAAC;IAE1E,IAAI,CAACQ,SAAS,EAAE;MACd,OAAO,KAAK;IACd;IAEA,OAAOG,OAAO,CAAC/B,KAAK,CAACK,2BAA2B,EAAE2B,QAAQ,CAACC,MAAM,CAACL,SAAS,CAAC,CAAC,CAAC;EAChF,CAAC;EAED,MAAMM,2BAA2BA,CAAA,EAAG;IAClC,MAAMC,IAAI,GAAG,MAAM,IAAI,CAAC1B,UAAU,CAAC,CAAC,CAACyB,2BAA2B,CAAC,CAAC;IAClElC,KAAK,CAACE,mBAAmB,GAAGiC,IAAI,CAACjC,mBAAmB;IACpDF,KAAK,CAACoC,sBAAsB,GAAGD,IAAI,CAACC,sBAAsB;EAC5D,CAAC;EAEDC,uBAAuBA,CAAA,EAAG;IACxB,MAAMC,QAAQ,GAAGtC,KAAK,CAACoC,sBAAsB,EACzCG,GAAG,CAACnB,EAAE,IAAIpB,KAAK,CAACyB,qBAAqB,EAAEe,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACrB,EAAE,KAAKA,EAAE,CAAC,CAAC,CAC3EsB,MAAM,CAACX,OAAO,CAAkB;IAEnC,OAAOO,QAAQ,IAAI,EAAE;EACvB,CAAC;EAEDK,8BAA8BA,CAAA,EAAG;IAC/B,OAAO,IAAI,CAACN,uBAAuB,CAAC,CAAC,CAACK,MAAM,CAC1CD,OAAO,IACLzC,KAAK,CAACK,2BAA2B,EAAEmC,IAAI,CAACZ,SAAS,IAAIa,OAAO,CAACrB,EAAE,KAAM,UAASQ,SAAU,EAAC,CAC7F,CAAC;EACH,CAAC;EAEDgB,4BAA4BA,CAAA,EAAG;IAC7B,MAAMC,OAAO,GAAG,IAAI,CAAC7C,KAAK,CAACgB,WAAW,EAAEI,EAAE,IAAI,UAAU;IACxD,MAAM0B,OAAO,GAAGC,4BAAa,CAACC,oBAAoB;IAElD,OAAQ,GAAEH,OAAQ,IAAGC,OAAQ,EAAC;EAChC,CAAC;EAED,MAAMG,mBAAmBA,CAACR,OAA8C,EAAE;IACxE,MAAM,IAAI,CAAChC,UAAU,CAAC,CAAC,CAACyC,iBAAiB,CAACT,OAAO,CAAC;IAClDzC,KAAK,CAACgB,WAAW,GAAGyB,OAAO;IAC3BxB,4CAAqB,CAACC,GAAG,CAAC;MAAEC,iBAAiB,EAAEsB,OAAO,EAAErB;IAAG,CAAC,CAAC;EAC/D,CAAC;EAED+B,YAAYA,CAAA,EAAG;IACbnD,KAAK,CAACgB,WAAW,GAAGhB,KAAK,CAACG,kBAAkB,IAAIC,SAAS;IACzDJ,KAAK,CAACM,oBAAoB,GAAGF,SAAS;IACtCJ,KAAK,CAACoC,sBAAsB,GAAGhC,SAAS;IACxCJ,KAAK,CAACE,mBAAmB,GAAG,IAAI;IAChCF,KAAK,CAACK,2BAA2B,GAAG,EAAE;EACxC;AACF,CAAC"}

package/lib/commonjs/utils/NetworkUtil.js

@@ -11,7 +11,7 @@ var _AccountController = require("../controllers/AccountController");
 var _ConnectorController = require("../controllers/ConnectorController");
 var _SwapController = require("../controllers/SwapController");
 const NetworkUtil = exports.NetworkUtil = {
-  async handleNetworkSwitch(network) {
+  async handleNetworkSwitch(network, navigate = true) {
     const {
       isConnected
     } = _AccountController.AccountController.state;
@@ -25,7 +25,9 @@ const NetworkUtil = exports.NetworkUtil = {
     if (isConnected && caipNetwork?.id !== network.id) {
       if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
         await _NetworkController.NetworkController.switchActiveNetwork(network);
-        _RouterUtil.RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
+        if (navigate) {
+          _RouterUtil.RouterUtil.goBackOrCloseModal();
+        }
         eventData = {
           type: 'SWITCH_NETWORK',
           networkId: network.id

package/lib/commonjs/utils/NetworkUtil.js.map

@@ -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"}
+{"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,QAAiB,GAAG,IAAI,EAAE;IACxE,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;QACjDW,kCAAgB,CAACC,IAAI,CAAC,eAAe,EAAE;UAAErB;QAAQ,CAAC,CAAC;MACrD;IACF,CAAC,MAAM,IAAI,CAACE,WAAW,EAAE;MACvBM,oCAAiB,CAACc,cAAc,CAACtB,OAAO,CAAC;MACzCoB,kCAAgB,CAACC,IAAI,CAAC,SAAS,CAAC;IAClC;IAEAE,8BAAc,CAACC,UAAU,CAAC,CAAC;IAE3B,OAAOZ,SAAS;EAClB;AACF,CAAC"}

package/lib/commonjs/utils/RouterUtil.js

@@ -7,27 +7,9 @@ exports.RouterUtil = void 0;
 var _RouterController = require("../controllers/RouterController");
 var _ModalController = require("../controllers/ModalController");
 const RouterUtil = exports.RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews = []) {
-    if (excludeViews.includes(_RouterController.RouterController.state.view)) {
-      return;
-    }
-    const {
-      history
-    } = _RouterController.RouterController.state;
-
-    // Find the last occurrence of 'Networks' or 'UnsupportedChain'
-    let lastNetworkViewIndex = -1;
-    for (let i = history.length - 1; i >= 0; i--) {
-      if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
-        lastNetworkViewIndex = i;
-        break;
-      }
-    }
-
-    // Case 1: Navigated from a network selection view deeper in the app
-    if (lastNetworkViewIndex > 0) {
-      // Go to the view right before the network selection
-      _RouterController.RouterController.goBackToIndex(lastNetworkViewIndex - 1);
+  goBackOrCloseModal() {
+    if (_RouterController.RouterController.state.history.length > 1) {
+      _RouterController.RouterController.goBack();
     } else {
       _ModalController.ModalController.close();
     }

package/lib/commonjs/utils/RouterUtil.js.map

@@ -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"}
+{"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/controllers/NetworkController.js

@@ -60,7 +60,8 @@ export const NetworkController = {
     state.approvedCaipNetworkIds = data.approvedCaipNetworkIds;
   },
   getApprovedCaipNetworks() {
-    return state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
+    const networks = state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
+    return networks ?? [];
   },
   getSmartAccountEnabledNetworks() {
     return this.getApprovedCaipNetworks().filter(network => state.smartAccountEnabledNetworks?.find(networkId => network.id === `eip155:${networkId}`));

package/lib/module/controllers/NetworkController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","ref","PublicStateController","NetworkUtil","ConstantsUtil","state","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","isUnsupportedNetwork","NetworkController","_getClient","_client","Error","setClient","client","setCaipNetwork","caipNetwork","set","selectedNetworkId","id","setDefaultCaipNetwork","setUnsupportedNetwork","setRequestedCaipNetworks","requestedNetworks","requestedCaipNetworks","setSmartAccountEnabledNetworks","checkIfSmartAccountEnabled","networkId","caipNetworkIdToNumber","Boolean","includes","Number","getApprovedCaipNetworksData","data","approvedCaipNetworkIds","getApprovedCaipNetworks","map","find","network","filter","getSmartAccountEnabledNetworks","getActiveNetworkTokenAddress","chainId","address","NATIVE_TOKEN_ADDRESS","switchActiveNetwork","switchCaipNetwork","resetNetwork"],"sourceRoot":"../../../src","sources":["controllers/NetworkController.ts"],"mappings":"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"}
+{"version":3,"names":["proxy","ref","PublicStateController","NetworkUtil","ConstantsUtil","state","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","isUnsupportedNetwork","NetworkController","_getClient","_client","Error","setClient","client","setCaipNetwork","caipNetwork","set","selectedNetworkId","id","setDefaultCaipNetwork","setUnsupportedNetwork","setRequestedCaipNetworks","requestedNetworks","requestedCaipNetworks","setSmartAccountEnabledNetworks","checkIfSmartAccountEnabled","networkId","caipNetworkIdToNumber","Boolean","includes","Number","getApprovedCaipNetworksData","data","approvedCaipNetworkIds","getApprovedCaipNetworks","networks","map","find","network","filter","getSmartAccountEnabledNetworks","getActiveNetworkTokenAddress","chainId","address","NATIVE_TOKEN_ADDRESS","switchActiveNetwork","switchCaipNetwork","resetNetwork"],"sourceRoot":"../../../src","sources":["controllers/NetworkController.ts"],"mappings":"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"}

package/lib/module/utils/NetworkUtil.js

@@ -5,7 +5,7 @@ import { AccountController } from '../controllers/AccountController';
 import { ConnectorController } from '../controllers/ConnectorController';
 import { SwapController } from '../controllers/SwapController';
 export const NetworkUtil = {
-  async handleNetworkSwitch(network) {
+  async handleNetworkSwitch(network, navigate = true) {
     const {
       isConnected
     } = AccountController.state;
@@ -19,7 +19,9 @@ export const NetworkUtil = {
     if (isConnected && caipNetwork?.id !== network.id) {
       if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
         await NetworkController.switchActiveNetwork(network);
-        RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
+        if (navigate) {
+          RouterUtil.goBackOrCloseModal();
+        }
         eventData = {
           type: 'SWITCH_NETWORK',
           networkId: network.id

package/lib/module/utils/NetworkUtil.js.map

@@ -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"}
+{"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,QAAiB,GAAG,IAAI,EAAE;IACxE,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;QACjDd,gBAAgB,CAACuB,IAAI,CAAC,eAAe,EAAE;UAAEhB;QAAQ,CAAC,CAAC;MACrD;IACF,CAAC,MAAM,IAAI,CAACE,WAAW,EAAE;MACvBR,iBAAiB,CAACuB,cAAc,CAACjB,OAAO,CAAC;MACzCP,gBAAgB,CAACuB,IAAI,CAAC,SAAS,CAAC;IAClC;IAEAnB,cAAc,CAACqB,UAAU,CAAC,CAAC;IAE3B,OAAOT,SAAS;EAClB;AACF,CAAC"}

package/lib/module/utils/RouterUtil.js

@@ -1,27 +1,9 @@
 import { RouterController } from '../controllers/RouterController';
 import { ModalController } from '../controllers/ModalController';
 export const RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews = []) {
-    if (excludeViews.includes(RouterController.state.view)) {
-      return;
-    }
-    const {
-      history
-    } = RouterController.state;
-
-    // Find the last occurrence of 'Networks' or 'UnsupportedChain'
-    let lastNetworkViewIndex = -1;
-    for (let i = history.length - 1; i >= 0; i--) {
-      if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
-        lastNetworkViewIndex = i;
-        break;
-      }
-    }
-
-    // Case 1: Navigated from a network selection view deeper in the app
-    if (lastNetworkViewIndex > 0) {
-      // Go to the view right before the network selection
-      RouterController.goBackToIndex(lastNetworkViewIndex - 1);
+  goBackOrCloseModal() {
+    if (RouterController.state.history.length > 1) {
+      RouterController.goBack();
     } else {
       ModalController.close();
     }

package/lib/module/utils/RouterUtil.js.map

@@ -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"}
+{"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/controllers/NetworkController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkController.d.ts","sourceRoot":"","sources":["../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMpE,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,2BAA2B,EAAE,MAAM,OAAO,CAAC;QACzC,sBAAsB,EAAE,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;QACzE,mBAAmB,EAAE,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;KACpE,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,sBAAsB;IACrC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,kBAAkB,CAAC,EAAE,WAAW,CAAC;IACjC,qBAAqB,CAAC,EAAE,WAAW,EAAE,CAAC;IACtC,sBAAsB,CAAC,EAAE,aAAa,EAAE,CAAC;IACzC,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAWD,eAAO,MAAM,iBAAiB;;;sBAWV,uBAAuB;gCAIb,sBAAsB,CAAC,aAAa,CAAC;uCAK9B,sBAAsB,CAAC,aAAa,CAAC;gDAM5B,sBAAsB,CAAC,sBAAsB,CAAC;gDAI9C,sBAAsB,CAAC,uBAAuB,CAAC;gEAK5D,sBAAsB,CAAC,6BAA6B,CAAC;;;;;;iCAyCjD,sBAAsB,CAAC,aAAa,CAAC;;CAazE,CAAC"}
+{"version":3,"file":"NetworkController.d.ts","sourceRoot":"","sources":["../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMpE,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,2BAA2B,EAAE,MAAM,OAAO,CAAC;QACzC,sBAAsB,EAAE,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;QACzE,mBAAmB,EAAE,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;KACpE,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,sBAAsB;IACrC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,kBAAkB,CAAC,EAAE,WAAW,CAAC;IACjC,qBAAqB,CAAC,EAAE,WAAW,EAAE,CAAC;IACtC,sBAAsB,CAAC,EAAE,aAAa,EAAE,CAAC;IACzC,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAWD,eAAO,MAAM,iBAAiB;;;sBAWV,uBAAuB;gCAIb,sBAAsB,CAAC,aAAa,CAAC;uCAK9B,sBAAsB,CAAC,aAAa,CAAC;gDAM5B,sBAAsB,CAAC,sBAAsB,CAAC;gDAI9C,sBAAsB,CAAC,uBAAuB,CAAC;gEAK5D,sBAAsB,CAAC,6BAA6B,CAAC;;;;;;iCA2CjD,sBAAsB,CAAC,aAAa,CAAC;;CAazE,CAAC"}

package/lib/typescript/utils/NetworkUtil.d.ts

@@ -1,6 +1,6 @@
 import type { CaipNetwork } from '../utils/TypeUtil';
 export declare const NetworkUtil: {
-    handleNetworkSwitch(network: CaipNetwork): Promise<{
+    handleNetworkSwitch(network: CaipNetwork, navigate?: boolean): Promise<{
         type: string;
         networkId: `${string}:${string}`;
     } | null>;

package/lib/typescript/utils/NetworkUtil.d.ts.map

@@ -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"}
+{"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,aAAY,OAAO;;;;CAyBlE,CAAC"}

package/lib/typescript/utils/RouterUtil.d.ts

@@ -1,5 +1,4 @@
-import { type RouterControllerState } from '../controllers/RouterController';
 export declare const RouterUtil: {
-    navigateAfterNetworkSwitch(excludeViews?: RouterControllerState['view'][]): void;
+    goBackOrCloseModal(): void;
 };
 //# sourceMappingURL=RouterUtil.d.ts.map

package/lib/typescript/utils/RouterUtil.d.ts.map

@@ -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"}
+{"version":3,"file":"RouterUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/RouterUtil.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,UAAU;;CAQtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-core-react-native",
-  "version": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526133444",
+  "version": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250527202404",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526133444",
+    "@reown/appkit-common-react-native": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250527202404",
     "valtio": "1.11.2"
   },
   "peerDependencies": {

package/src/controllers/NetworkController.ts

@@ -90,9 +90,11 @@ export const NetworkController = {
   },
 
   getApprovedCaipNetworks() {
-    return state.approvedCaipNetworkIds
+    const networks = state.approvedCaipNetworkIds
       ?.map(id => state.requestedCaipNetworks?.find(network => network.id === id))
       .filter(Boolean) as CaipNetwork[];
+
+    return networks ?? [];
   },
 
   getSmartAccountEnabledNetworks() {

package/src/utils/NetworkUtil.ts

@@ -7,7 +7,7 @@ import { SwapController } from '../controllers/SwapController';
 import type { CaipNetwork } from '../utils/TypeUtil';
 
 export const NetworkUtil = {
-  async handleNetworkSwitch(network: CaipNetwork) {
+  async handleNetworkSwitch(network: CaipNetwork, navigate: boolean = true) {
     const { isConnected } = AccountController.state;
     const { caipNetwork, approvedCaipNetworkIds, supportsAllNetworks } = NetworkController.state;
     const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
@@ -16,7 +16,9 @@ export const NetworkUtil = {
     if (isConnected && caipNetwork?.id !== network.id) {
       if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
         await NetworkController.switchActiveNetwork(network);
-        RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
+        if (navigate) {
+          RouterUtil.goBackOrCloseModal();
+        }
         eventData = { type: 'SWITCH_NETWORK', networkId: network.id };
       } else if (supportsAllNetworks || isAuthConnector) {
         RouterController.push('SwitchNetwork', { network });

package/src/utils/RouterUtil.ts

@@ -1,27 +1,10 @@
-import { RouterController, type RouterControllerState } from '../controllers/RouterController';
+import { RouterController } from '../controllers/RouterController';
 import { ModalController } from '../controllers/ModalController';
 
 export const RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews: RouterControllerState['view'][] = []) {
-    if (excludeViews.includes(RouterController.state.view)) {
-      return;
-    }
-
-    const { history } = RouterController.state;
-
-    // Find the last occurrence of 'Networks' or 'UnsupportedChain'
-    let lastNetworkViewIndex = -1;
-    for (let i = history.length - 1; i >= 0; i--) {
-      if (history[i] === 'Networks' || history[i] === 'UnsupportedChain') {
-        lastNetworkViewIndex = i;
-        break;
-      }
-    }
-
-    // Case 1: Navigated from a network selection view deeper in the app
-    if (lastNetworkViewIndex > 0) {
-      // Go to the view right before the network selection
-      RouterController.goBackToIndex(lastNetworkViewIndex - 1);
+  goBackOrCloseModal() {
+    if (RouterController.state.history.length > 1) {
+      RouterController.goBack();
     } else {
       ModalController.close();
     }