@reown/appkit-core-react-native 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250526162614 → 0.0.0-devin-1747935179-fix-unsupported-network-detection-20250528155832
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 +3 -7
- package/lib/commonjs/controllers/NetworkController.js.map +1 -1
- package/lib/commonjs/utils/NetworkUtil.js +4 -8
- package/lib/commonjs/utils/NetworkUtil.js.map +1 -1
- package/lib/module/controllers/NetworkController.js +3 -7
- package/lib/module/controllers/NetworkController.js.map +1 -1
- package/lib/module/utils/NetworkUtil.js +4 -8
- package/lib/module/utils/NetworkUtil.js.map +1 -1
- package/lib/typescript/controllers/NetworkController.d.ts +0 -2
- package/lib/typescript/controllers/NetworkController.d.ts.map +1 -1
- package/lib/typescript/utils/NetworkUtil.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/controllers/NetworkController.ts +4 -9
- package/src/utils/NetworkUtil.ts +3 -7
|
@@ -14,8 +14,7 @@ var _ConstantsUtil = require("../utils/ConstantsUtil");
|
|
|
14
14
|
const state = (0, _valtio.proxy)({
|
|
15
15
|
supportsAllNetworks: true,
|
|
16
16
|
defaultCaipNetwork: undefined,
|
|
17
|
-
smartAccountEnabledNetworks: []
|
|
18
|
-
isUnsupportedNetwork: false
|
|
17
|
+
smartAccountEnabledNetworks: []
|
|
19
18
|
});
|
|
20
19
|
|
|
21
20
|
// -- Controller ---------------------------------------- //
|
|
@@ -43,9 +42,6 @@ const NetworkController = exports.NetworkController = {
|
|
|
43
42
|
selectedNetworkId: caipNetwork?.id
|
|
44
43
|
});
|
|
45
44
|
},
|
|
46
|
-
setUnsupportedNetwork(isUnsupportedNetwork) {
|
|
47
|
-
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
48
|
-
},
|
|
49
45
|
setRequestedCaipNetworks(requestedNetworks) {
|
|
50
46
|
state.requestedCaipNetworks = requestedNetworks;
|
|
51
47
|
},
|
|
@@ -65,7 +61,8 @@ const NetworkController = exports.NetworkController = {
|
|
|
65
61
|
state.approvedCaipNetworkIds = data.approvedCaipNetworkIds;
|
|
66
62
|
},
|
|
67
63
|
getApprovedCaipNetworks() {
|
|
68
|
-
|
|
64
|
+
const networks = state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
|
|
65
|
+
return networks ?? [];
|
|
69
66
|
},
|
|
70
67
|
getSmartAccountEnabledNetworks() {
|
|
71
68
|
return this.getApprovedCaipNetworks().filter(network => state.smartAccountEnabledNetworks?.find(networkId => network.id === `eip155:${networkId}`));
|
|
@@ -84,7 +81,6 @@ const NetworkController = exports.NetworkController = {
|
|
|
84
81
|
},
|
|
85
82
|
resetNetwork() {
|
|
86
83
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
87
|
-
state.isUnsupportedNetwork = undefined;
|
|
88
84
|
state.approvedCaipNetworkIds = undefined;
|
|
89
85
|
state.supportsAllNetworks = true;
|
|
90
86
|
state.smartAccountEnabledNetworks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_valtio","require","_PublicStateController","_appkitCommonReactNative","_ConstantsUtil","state","proxy","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","
|
|
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","networks","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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"}
|
|
@@ -33,17 +33,13 @@ const NetworkUtil = exports.NetworkUtil = {
|
|
|
33
33
|
networkId: network.id
|
|
34
34
|
};
|
|
35
35
|
} else if (supportsAllNetworks || isAuthConnector) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
}
|
|
36
|
+
_RouterController.RouterController.push('SwitchNetwork', {
|
|
37
|
+
network
|
|
38
|
+
});
|
|
41
39
|
}
|
|
42
40
|
} else if (!isConnected) {
|
|
43
41
|
_NetworkController.NetworkController.setCaipNetwork(network);
|
|
44
|
-
|
|
45
|
-
_RouterController.RouterController.push('Connect');
|
|
46
|
-
}
|
|
42
|
+
_RouterController.RouterController.push('Connect');
|
|
47
43
|
}
|
|
48
44
|
_SwapController.SwapController.resetState();
|
|
49
45
|
return eventData;
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,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"}
|
|
@@ -9,8 +9,7 @@ import { ConstantsUtil } from '../utils/ConstantsUtil';
|
|
|
9
9
|
const state = proxy({
|
|
10
10
|
supportsAllNetworks: true,
|
|
11
11
|
defaultCaipNetwork: undefined,
|
|
12
|
-
smartAccountEnabledNetworks: []
|
|
13
|
-
isUnsupportedNetwork: false
|
|
12
|
+
smartAccountEnabledNetworks: []
|
|
14
13
|
});
|
|
15
14
|
|
|
16
15
|
// -- Controller ---------------------------------------- //
|
|
@@ -38,9 +37,6 @@ export const NetworkController = {
|
|
|
38
37
|
selectedNetworkId: caipNetwork?.id
|
|
39
38
|
});
|
|
40
39
|
},
|
|
41
|
-
setUnsupportedNetwork(isUnsupportedNetwork) {
|
|
42
|
-
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
43
|
-
},
|
|
44
40
|
setRequestedCaipNetworks(requestedNetworks) {
|
|
45
41
|
state.requestedCaipNetworks = requestedNetworks;
|
|
46
42
|
},
|
|
@@ -60,7 +56,8 @@ export const NetworkController = {
|
|
|
60
56
|
state.approvedCaipNetworkIds = data.approvedCaipNetworkIds;
|
|
61
57
|
},
|
|
62
58
|
getApprovedCaipNetworks() {
|
|
63
|
-
|
|
59
|
+
const networks = state.approvedCaipNetworkIds?.map(id => state.requestedCaipNetworks?.find(network => network.id === id)).filter(Boolean);
|
|
60
|
+
return networks ?? [];
|
|
64
61
|
},
|
|
65
62
|
getSmartAccountEnabledNetworks() {
|
|
66
63
|
return this.getApprovedCaipNetworks().filter(network => state.smartAccountEnabledNetworks?.find(networkId => network.id === `eip155:${networkId}`));
|
|
@@ -79,7 +76,6 @@ export const NetworkController = {
|
|
|
79
76
|
},
|
|
80
77
|
resetNetwork() {
|
|
81
78
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
82
|
-
state.isUnsupportedNetwork = undefined;
|
|
83
79
|
state.approvedCaipNetworkIds = undefined;
|
|
84
80
|
state.supportsAllNetworks = true;
|
|
85
81
|
state.smartAccountEnabledNetworks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["proxy","ref","PublicStateController","NetworkUtil","ConstantsUtil","state","supportsAllNetworks","defaultCaipNetwork","undefined","smartAccountEnabledNetworks","
|
|
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","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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"}
|
|
@@ -27,17 +27,13 @@ export const NetworkUtil = {
|
|
|
27
27
|
networkId: network.id
|
|
28
28
|
};
|
|
29
29
|
} else if (supportsAllNetworks || isAuthConnector) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
}
|
|
30
|
+
RouterController.push('SwitchNetwork', {
|
|
31
|
+
network
|
|
32
|
+
});
|
|
35
33
|
}
|
|
36
34
|
} else if (!isConnected) {
|
|
37
35
|
NetworkController.setCaipNetwork(network);
|
|
38
|
-
|
|
39
|
-
RouterController.push('Connect');
|
|
40
|
-
}
|
|
36
|
+
RouterController.push('Connect');
|
|
41
37
|
}
|
|
42
38
|
SwapController.resetState();
|
|
43
39
|
return eventData;
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,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"}
|
|
@@ -14,7 +14,6 @@ export interface NetworkControllerState {
|
|
|
14
14
|
requestedCaipNetworks?: CaipNetwork[];
|
|
15
15
|
approvedCaipNetworkIds?: CaipNetworkId[];
|
|
16
16
|
smartAccountEnabledNetworks: number[];
|
|
17
|
-
isUnsupportedNetwork?: boolean;
|
|
18
17
|
}
|
|
19
18
|
export declare const NetworkController: {
|
|
20
19
|
state: NetworkControllerState;
|
|
@@ -22,7 +21,6 @@ export declare const NetworkController: {
|
|
|
22
21
|
setClient(client: NetworkControllerClient): void;
|
|
23
22
|
setCaipNetwork(caipNetwork: NetworkControllerState['caipNetwork']): void;
|
|
24
23
|
setDefaultCaipNetwork(caipNetwork: NetworkControllerState['caipNetwork']): void;
|
|
25
|
-
setUnsupportedNetwork(isUnsupportedNetwork: NetworkControllerState['isUnsupportedNetwork']): void;
|
|
26
24
|
setRequestedCaipNetworks(requestedNetworks: NetworkControllerState['requestedCaipNetworks']): void;
|
|
27
25
|
setSmartAccountEnabledNetworks(smartAccountEnabledNetworks: NetworkControllerState['smartAccountEnabledNetworks']): void;
|
|
28
26
|
checkIfSmartAccountEnabled(): boolean;
|
|
@@ -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;CACvC;AAUD,eAAO,MAAM,iBAAiB;;;sBAWV,uBAAuB;gCAIb,sBAAsB,CAAC,aAAa,CAAC;uCAK9B,sBAAsB,CAAC,aAAa,CAAC;gDAM5B,sBAAsB,CAAC,uBAAuB,CAAC;gEAK5D,sBAAsB,CAAC,6BAA6B,CAAC;;;;;;iCA2CjD,sBAAsB,CAAC,aAAa,CAAC;;CAYzE,CAAC"}
|
|
@@ -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;;;;
|
|
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,aAAY,OAAO;;;;CAyBlE,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-20250528155832",
|
|
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-20250528155832",
|
|
42
42
|
"valtio": "1.11.2"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
@@ -21,15 +21,13 @@ export interface NetworkControllerState {
|
|
|
21
21
|
requestedCaipNetworks?: CaipNetwork[];
|
|
22
22
|
approvedCaipNetworkIds?: CaipNetworkId[];
|
|
23
23
|
smartAccountEnabledNetworks: number[];
|
|
24
|
-
isUnsupportedNetwork?: boolean;
|
|
25
24
|
}
|
|
26
25
|
|
|
27
26
|
// -- State --------------------------------------------- //
|
|
28
27
|
const state = proxy<NetworkControllerState>({
|
|
29
28
|
supportsAllNetworks: true,
|
|
30
29
|
defaultCaipNetwork: undefined,
|
|
31
|
-
smartAccountEnabledNetworks: []
|
|
32
|
-
isUnsupportedNetwork: false
|
|
30
|
+
smartAccountEnabledNetworks: []
|
|
33
31
|
});
|
|
34
32
|
|
|
35
33
|
// -- Controller ---------------------------------------- //
|
|
@@ -59,10 +57,6 @@ export const NetworkController = {
|
|
|
59
57
|
PublicStateController.set({ selectedNetworkId: caipNetwork?.id });
|
|
60
58
|
},
|
|
61
59
|
|
|
62
|
-
setUnsupportedNetwork(isUnsupportedNetwork: NetworkControllerState['isUnsupportedNetwork']) {
|
|
63
|
-
state.isUnsupportedNetwork = isUnsupportedNetwork;
|
|
64
|
-
},
|
|
65
|
-
|
|
66
60
|
setRequestedCaipNetworks(requestedNetworks: NetworkControllerState['requestedCaipNetworks']) {
|
|
67
61
|
state.requestedCaipNetworks = requestedNetworks;
|
|
68
62
|
},
|
|
@@ -90,9 +84,11 @@ export const NetworkController = {
|
|
|
90
84
|
},
|
|
91
85
|
|
|
92
86
|
getApprovedCaipNetworks() {
|
|
93
|
-
|
|
87
|
+
const networks = state.approvedCaipNetworkIds
|
|
94
88
|
?.map(id => state.requestedCaipNetworks?.find(network => network.id === id))
|
|
95
89
|
.filter(Boolean) as CaipNetwork[];
|
|
90
|
+
|
|
91
|
+
return networks ?? [];
|
|
96
92
|
},
|
|
97
93
|
|
|
98
94
|
getSmartAccountEnabledNetworks() {
|
|
@@ -117,7 +113,6 @@ export const NetworkController = {
|
|
|
117
113
|
|
|
118
114
|
resetNetwork() {
|
|
119
115
|
state.caipNetwork = state.defaultCaipNetwork || undefined;
|
|
120
|
-
state.isUnsupportedNetwork = undefined;
|
|
121
116
|
state.approvedCaipNetworkIds = undefined;
|
|
122
117
|
state.supportsAllNetworks = true;
|
|
123
118
|
state.smartAccountEnabledNetworks = [];
|
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, navigate = true) {
|
|
10
|
+
async handleNetworkSwitch(network: CaipNetwork, navigate: boolean = true) {
|
|
11
11
|
const { isConnected } = AccountController.state;
|
|
12
12
|
const { caipNetwork, approvedCaipNetworkIds, supportsAllNetworks } = NetworkController.state;
|
|
13
13
|
const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
|
|
@@ -21,15 +21,11 @@ export const NetworkUtil = {
|
|
|
21
21
|
}
|
|
22
22
|
eventData = { type: 'SWITCH_NETWORK', networkId: network.id };
|
|
23
23
|
} else if (supportsAllNetworks || isAuthConnector) {
|
|
24
|
-
|
|
25
|
-
RouterController.push('SwitchNetwork', { network });
|
|
26
|
-
}
|
|
24
|
+
RouterController.push('SwitchNetwork', { network });
|
|
27
25
|
}
|
|
28
26
|
} else if (!isConnected) {
|
|
29
27
|
NetworkController.setCaipNetwork(network);
|
|
30
|
-
|
|
31
|
-
RouterController.push('Connect');
|
|
32
|
-
}
|
|
28
|
+
RouterController.push('Connect');
|
|
33
29
|
}
|
|
34
30
|
|
|
35
31
|
SwapController.resetState();
|