@reown/appkit-core-react-native 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250522195737 → 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526133444
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/controllers/NetworkController.js +6 -7
- package/lib/commonjs/controllers/NetworkController.js.map +1 -1
- package/lib/commonjs/utils/NetworkUtil.js +3 -3
- package/lib/commonjs/utils/NetworkUtil.js.map +1 -1
- package/lib/commonjs/utils/RouterUtil.js +14 -3
- package/lib/commonjs/utils/RouterUtil.js.map +1 -1
- package/lib/module/controllers/NetworkController.js +6 -7
- package/lib/module/controllers/NetworkController.js.map +1 -1
- package/lib/module/utils/NetworkUtil.js +3 -3
- package/lib/module/utils/NetworkUtil.js.map +1 -1
- package/lib/module/utils/RouterUtil.js +14 -3
- package/lib/module/utils/RouterUtil.js.map +1 -1
- package/lib/typescript/controllers/NetworkController.d.ts +2 -1
- package/lib/typescript/controllers/NetworkController.d.ts.map +1 -1
- package/lib/typescript/utils/RouterUtil.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/controllers/NetworkController.ts +8 -9
- package/src/utils/NetworkUtil.ts +3 -3
- package/src/utils/RouterUtil.ts +13 -5
|
@@ -14,7 +14,8 @@ var _ConstantsUtil = require("../utils/ConstantsUtil");
|
|
|
14
14
|
const state = (0, _valtio.proxy)({
|
|
15
15
|
supportsAllNetworks: true,
|
|
16
16
|
defaultCaipNetwork: undefined,
|
|
17
|
-
smartAccountEnabledNetworks: []
|
|
17
|
+
smartAccountEnabledNetworks: [],
|
|
18
|
+
isUnsupportedNetwork: false
|
|
18
19
|
});
|
|
19
20
|
|
|
20
21
|
// -- Controller ---------------------------------------- //
|
|
@@ -42,6 +43,9 @@ const NetworkController = exports.NetworkController = {
|
|
|
42
43
|
selectedNetworkId: caipNetwork?.id
|
|
43
44
|
});
|
|
44
45
|
},
|
|
46
|
+
setUnsupportedNetwork(isUnsupportedNetwork) {
|
|
47
|
+
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
48
|
+
},
|
|
45
49
|
setRequestedCaipNetworks(requestedNetworks) {
|
|
46
50
|
state.requestedCaipNetworks = requestedNetworks;
|
|
47
51
|
},
|
|
@@ -80,15 +84,10 @@ const NetworkController = exports.NetworkController = {
|
|
|
80
84
|
},
|
|
81
85
|
resetNetwork() {
|
|
82
86
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
87
|
+
state.isUnsupportedNetwork = undefined;
|
|
83
88
|
state.approvedCaipNetworkIds = undefined;
|
|
84
89
|
state.supportsAllNetworks = true;
|
|
85
90
|
state.smartAccountEnabledNetworks = [];
|
|
86
|
-
},
|
|
87
|
-
isActiveNetworkInRequestedNetworks() {
|
|
88
|
-
if (!state.caipNetwork || !state.requestedCaipNetworks?.length) {
|
|
89
|
-
return false;
|
|
90
|
-
}
|
|
91
|
-
return state.requestedCaipNetworks.some(network => network.id === state.caipNetwork?.id);
|
|
92
91
|
}
|
|
93
92
|
};
|
|
94
93
|
//# sourceMappingURL=NetworkController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_valtio","require","_PublicStateController","_appkitCommonReactNative","_ConstantsUtil","state","proxy","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","NetworkController","exports","_getClient","_client","Error","setClient","client","ref","setCaipNetwork","caipNetwork","PublicStateController","set","selectedNetworkId","id","setDefaultCaipNetwork","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"
|
|
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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"}
|
|
@@ -20,17 +20,17 @@ const NetworkUtil = exports.NetworkUtil = {
|
|
|
20
20
|
approvedCaipNetworkIds,
|
|
21
21
|
supportsAllNetworks
|
|
22
22
|
} = _NetworkController.NetworkController.state;
|
|
23
|
-
const
|
|
23
|
+
const isAuthConnector = _ConnectorController.ConnectorController.state.connectedConnector === 'AUTH';
|
|
24
24
|
let eventData = null;
|
|
25
25
|
if (isConnected && caipNetwork?.id !== network.id) {
|
|
26
|
-
if (approvedCaipNetworkIds?.includes(network.id) && !
|
|
26
|
+
if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
|
|
27
27
|
await _NetworkController.NetworkController.switchActiveNetwork(network);
|
|
28
28
|
_RouterUtil.RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
|
|
29
29
|
eventData = {
|
|
30
30
|
type: 'SWITCH_NETWORK',
|
|
31
31
|
networkId: network.id
|
|
32
32
|
};
|
|
33
|
-
} else if (supportsAllNetworks ||
|
|
33
|
+
} else if (supportsAllNetworks || isAuthConnector) {
|
|
34
34
|
_RouterController.RouterController.push('SwitchNetwork', {
|
|
35
35
|
network
|
|
36
36
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_RouterUtil","require","_RouterController","_NetworkController","_AccountController","_ConnectorController","_SwapController","NetworkUtil","exports","handleNetworkSwitch","network","isConnected","AccountController","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","NetworkController","
|
|
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"}
|
|
@@ -14,9 +14,20 @@ const RouterUtil = exports.RouterUtil = {
|
|
|
14
14
|
const {
|
|
15
15
|
history
|
|
16
16
|
} = _RouterController.RouterController.state;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
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);
|
|
20
31
|
} else {
|
|
21
32
|
_ModalController.ModalController.close();
|
|
22
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_RouterController","require","_ModalController","RouterUtil","exports","navigateAfterNetworkSwitch","excludeViews","includes","RouterController","state","view","history","
|
|
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"}
|
|
@@ -9,7 +9,8 @@ import { ConstantsUtil } from '../utils/ConstantsUtil';
|
|
|
9
9
|
const state = proxy({
|
|
10
10
|
supportsAllNetworks: true,
|
|
11
11
|
defaultCaipNetwork: undefined,
|
|
12
|
-
smartAccountEnabledNetworks: []
|
|
12
|
+
smartAccountEnabledNetworks: [],
|
|
13
|
+
isUnsupportedNetwork: false
|
|
13
14
|
});
|
|
14
15
|
|
|
15
16
|
// -- Controller ---------------------------------------- //
|
|
@@ -37,6 +38,9 @@ export const NetworkController = {
|
|
|
37
38
|
selectedNetworkId: caipNetwork?.id
|
|
38
39
|
});
|
|
39
40
|
},
|
|
41
|
+
setUnsupportedNetwork(isUnsupportedNetwork) {
|
|
42
|
+
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
43
|
+
},
|
|
40
44
|
setRequestedCaipNetworks(requestedNetworks) {
|
|
41
45
|
state.requestedCaipNetworks = requestedNetworks;
|
|
42
46
|
},
|
|
@@ -75,15 +79,10 @@ export const NetworkController = {
|
|
|
75
79
|
},
|
|
76
80
|
resetNetwork() {
|
|
77
81
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
82
|
+
state.isUnsupportedNetwork = undefined;
|
|
78
83
|
state.approvedCaipNetworkIds = undefined;
|
|
79
84
|
state.supportsAllNetworks = true;
|
|
80
85
|
state.smartAccountEnabledNetworks = [];
|
|
81
|
-
},
|
|
82
|
-
isActiveNetworkInRequestedNetworks() {
|
|
83
|
-
if (!state.caipNetwork || !state.requestedCaipNetworks?.length) {
|
|
84
|
-
return false;
|
|
85
|
-
}
|
|
86
|
-
return state.requestedCaipNetworks.some(network => network.id === state.caipNetwork?.id);
|
|
87
86
|
}
|
|
88
87
|
};
|
|
89
88
|
//# sourceMappingURL=NetworkController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["proxy","ref","PublicStateController","NetworkUtil","ConstantsUtil","state","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","NetworkController","_getClient","_client","Error","setClient","client","setCaipNetwork","caipNetwork","set","selectedNetworkId","id","setDefaultCaipNetwork","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"
|
|
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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"}
|
|
@@ -14,17 +14,17 @@ export const NetworkUtil = {
|
|
|
14
14
|
approvedCaipNetworkIds,
|
|
15
15
|
supportsAllNetworks
|
|
16
16
|
} = NetworkController.state;
|
|
17
|
-
const
|
|
17
|
+
const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
|
|
18
18
|
let eventData = null;
|
|
19
19
|
if (isConnected && caipNetwork?.id !== network.id) {
|
|
20
|
-
if (approvedCaipNetworkIds?.includes(network.id) && !
|
|
20
|
+
if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
|
|
21
21
|
await NetworkController.switchActiveNetwork(network);
|
|
22
22
|
RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
|
|
23
23
|
eventData = {
|
|
24
24
|
type: 'SWITCH_NETWORK',
|
|
25
25
|
networkId: network.id
|
|
26
26
|
};
|
|
27
|
-
} else if (supportsAllNetworks ||
|
|
27
|
+
} else if (supportsAllNetworks || isAuthConnector) {
|
|
28
28
|
RouterController.push('SwitchNetwork', {
|
|
29
29
|
network
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RouterUtil","RouterController","NetworkController","AccountController","ConnectorController","SwapController","NetworkUtil","handleNetworkSwitch","network","isConnected","state","caipNetwork","approvedCaipNetworkIds","supportsAllNetworks","
|
|
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"}
|
|
@@ -8,9 +8,20 @@ export const RouterUtil = {
|
|
|
8
8
|
const {
|
|
9
9
|
history
|
|
10
10
|
} = RouterController.state;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
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);
|
|
14
25
|
} else {
|
|
15
26
|
ModalController.close();
|
|
16
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RouterController","ModalController","RouterUtil","navigateAfterNetworkSwitch","excludeViews","includes","state","view","history","
|
|
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"}
|
|
@@ -14,6 +14,7 @@ export interface NetworkControllerState {
|
|
|
14
14
|
requestedCaipNetworks?: CaipNetwork[];
|
|
15
15
|
approvedCaipNetworkIds?: CaipNetworkId[];
|
|
16
16
|
smartAccountEnabledNetworks: number[];
|
|
17
|
+
isUnsupportedNetwork?: boolean;
|
|
17
18
|
}
|
|
18
19
|
export declare const NetworkController: {
|
|
19
20
|
state: NetworkControllerState;
|
|
@@ -21,6 +22,7 @@ export declare const NetworkController: {
|
|
|
21
22
|
setClient(client: NetworkControllerClient): void;
|
|
22
23
|
setCaipNetwork(caipNetwork: NetworkControllerState['caipNetwork']): void;
|
|
23
24
|
setDefaultCaipNetwork(caipNetwork: NetworkControllerState['caipNetwork']): void;
|
|
25
|
+
setUnsupportedNetwork(isUnsupportedNetwork: NetworkControllerState['isUnsupportedNetwork']): void;
|
|
24
26
|
setRequestedCaipNetworks(requestedNetworks: NetworkControllerState['requestedCaipNetworks']): void;
|
|
25
27
|
setSmartAccountEnabledNetworks(smartAccountEnabledNetworks: NetworkControllerState['smartAccountEnabledNetworks']): void;
|
|
26
28
|
checkIfSmartAccountEnabled(): boolean;
|
|
@@ -30,6 +32,5 @@ export declare const NetworkController: {
|
|
|
30
32
|
getActiveNetworkTokenAddress(): string;
|
|
31
33
|
switchActiveNetwork(network: NetworkControllerState['caipNetwork']): Promise<void>;
|
|
32
34
|
resetNetwork(): void;
|
|
33
|
-
isActiveNetworkInRequestedNetworks(): boolean;
|
|
34
35
|
};
|
|
35
36
|
//# sourceMappingURL=NetworkController.d.ts.map
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -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;
|
|
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"}
|
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-
|
|
3
|
+
"version": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526133444",
|
|
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-
|
|
41
|
+
"@reown/appkit-common-react-native": "0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526133444",
|
|
42
42
|
"valtio": "1.11.2"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
@@ -21,13 +21,15 @@ export interface NetworkControllerState {
|
|
|
21
21
|
requestedCaipNetworks?: CaipNetwork[];
|
|
22
22
|
approvedCaipNetworkIds?: CaipNetworkId[];
|
|
23
23
|
smartAccountEnabledNetworks: number[];
|
|
24
|
+
isUnsupportedNetwork?: boolean;
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
// -- State --------------------------------------------- //
|
|
27
28
|
const state = proxy<NetworkControllerState>({
|
|
28
29
|
supportsAllNetworks: true,
|
|
29
30
|
defaultCaipNetwork: undefined,
|
|
30
|
-
smartAccountEnabledNetworks: []
|
|
31
|
+
smartAccountEnabledNetworks: [],
|
|
32
|
+
isUnsupportedNetwork: false
|
|
31
33
|
});
|
|
32
34
|
|
|
33
35
|
// -- Controller ---------------------------------------- //
|
|
@@ -57,6 +59,10 @@ export const NetworkController = {
|
|
|
57
59
|
PublicStateController.set({ selectedNetworkId: caipNetwork?.id });
|
|
58
60
|
},
|
|
59
61
|
|
|
62
|
+
setUnsupportedNetwork(isUnsupportedNetwork: NetworkControllerState['isUnsupportedNetwork']) {
|
|
63
|
+
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
64
|
+
},
|
|
65
|
+
|
|
60
66
|
setRequestedCaipNetworks(requestedNetworks: NetworkControllerState['requestedCaipNetworks']) {
|
|
61
67
|
state.requestedCaipNetworks = requestedNetworks;
|
|
62
68
|
},
|
|
@@ -111,16 +117,9 @@ export const NetworkController = {
|
|
|
111
117
|
|
|
112
118
|
resetNetwork() {
|
|
113
119
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
120
|
+
state.isUnsupportedNetwork = undefined;
|
|
114
121
|
state.approvedCaipNetworkIds = undefined;
|
|
115
122
|
state.supportsAllNetworks = true;
|
|
116
123
|
state.smartAccountEnabledNetworks = [];
|
|
117
|
-
},
|
|
118
|
-
|
|
119
|
-
isActiveNetworkInRequestedNetworks() {
|
|
120
|
-
if (!state.caipNetwork || !state.requestedCaipNetworks?.length) {
|
|
121
|
-
return false;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
return state.requestedCaipNetworks.some(network => network.id === state.caipNetwork?.id);
|
|
125
124
|
}
|
|
126
125
|
};
|
package/src/utils/NetworkUtil.ts
CHANGED
|
@@ -10,15 +10,15 @@ export const NetworkUtil = {
|
|
|
10
10
|
async handleNetworkSwitch(network: CaipNetwork) {
|
|
11
11
|
const { isConnected } = AccountController.state;
|
|
12
12
|
const { caipNetwork, approvedCaipNetworkIds, supportsAllNetworks } = NetworkController.state;
|
|
13
|
-
const
|
|
13
|
+
const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
|
|
14
14
|
let eventData = null;
|
|
15
15
|
|
|
16
16
|
if (isConnected && caipNetwork?.id !== network.id) {
|
|
17
|
-
if (approvedCaipNetworkIds?.includes(network.id) && !
|
|
17
|
+
if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
|
|
18
18
|
await NetworkController.switchActiveNetwork(network);
|
|
19
19
|
RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
|
|
20
20
|
eventData = { type: 'SWITCH_NETWORK', networkId: network.id };
|
|
21
|
-
} else if (supportsAllNetworks ||
|
|
21
|
+
} else if (supportsAllNetworks || isAuthConnector) {
|
|
22
22
|
RouterController.push('SwitchNetwork', { network });
|
|
23
23
|
}
|
|
24
24
|
} else if (!isConnected) {
|
package/src/utils/RouterUtil.ts
CHANGED
|
@@ -8,12 +8,20 @@ export const RouterUtil = {
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
const { history } = RouterController.state;
|
|
11
|
-
const networkSelectIndex = history.findIndex(
|
|
12
|
-
name => name === 'Networks' || name === 'UnsupportedChain'
|
|
13
|
-
);
|
|
14
11
|
|
|
15
|
-
|
|
16
|
-
|
|
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);
|
|
17
25
|
} else {
|
|
18
26
|
ModalController.close();
|
|
19
27
|
}
|