@reown/appkit-core 1.0.1 → 1.0.2

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.
@@ -75,14 +75,19 @@ export const ChainController = {
75
75
  state.universalAdapter = adapter;
76
76
  if (adapters.length === 0) {
77
77
  const storedCaipNetwork = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK);
78
- if (storedCaipNetwork) {
79
- state.activeChain = storedCaipNetwork.chainNamespace;
80
- this.setActiveCaipNetwork(storedCaipNetwork);
78
+ try {
79
+ if (storedCaipNetwork) {
80
+ state.activeChain = storedCaipNetwork.chainNamespace;
81
+ this.setActiveCaipNetwork(storedCaipNetwork);
82
+ }
83
+ else {
84
+ state.activeChain =
85
+ adapter?.defaultNetwork?.chainNamespace ?? adapter.caipNetworks[0]?.chainNamespace;
86
+ this.setActiveCaipNetwork(adapter?.defaultNetwork ?? adapter.caipNetworks[0]);
87
+ }
81
88
  }
82
- else {
83
- state.activeChain =
84
- adapter?.defaultNetwork?.chainNamespace ?? adapter.caipNetworks[0]?.chainNamespace;
85
- this.setActiveCaipNetwork(adapter?.defaultNetwork ?? adapter.caipNetworks[0]);
89
+ catch (error) {
90
+ console.warn('>>> Error setting active caip network', error);
86
91
  }
87
92
  }
88
93
  const chains = [...new Set(adapter.caipNetworks.map(caipNetwork => caipNetwork.chainNamespace))];
@@ -163,6 +168,8 @@ export const ChainController = {
163
168
  }
164
169
  if (caipNetwork.chainNamespace !== state.activeChain) {
165
170
  this.setActiveChain(caipNetwork.chainNamespace, caipNetwork);
171
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK, caipNetwork);
172
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork.id);
166
173
  return;
167
174
  }
168
175
  state.activeCaipNetwork = caipNetwork;
@@ -197,8 +204,7 @@ export const ChainController = {
197
204
  const chain = state.activeChain;
198
205
  const isWcConnector = walletId === 'walletConnect';
199
206
  const universalNetworkControllerClient = state.universalAdapter.networkControllerClient;
200
- const hasWagmiAdapter = state.chains.get('eip155')?.adapterType === 'wagmi';
201
- const shouldUseUniversalAdapter = (isWcConnector && !hasWagmiAdapter) || state.noAdapters;
207
+ const shouldUseUniversalAdapter = isWcConnector || state.noAdapters;
202
208
  if (shouldUseUniversalAdapter) {
203
209
  if (!universalNetworkControllerClient) {
204
210
  throw new Error("Universal Adapter's networkControllerClient is not set");
@@ -221,7 +227,7 @@ export const ChainController = {
221
227
  const chain = _chain || state.activeChain;
222
228
  const isWcConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR) === 'WALLET_CONNECT';
223
229
  const universalConnectionControllerClient = state.universalAdapter.connectionControllerClient;
224
- const hasWagmiAdapter = chain === 'eip155' && state.chains.get('eip155')?.adapterType === 'wagmi';
230
+ const hasWagmiAdapter = state.chains.get('eip155')?.adapterType === 'wagmi';
225
231
  const shouldUseUniversalAdapter = (isWcConnector && !hasWagmiAdapter) || state.noAdapters;
226
232
  if (shouldUseUniversalAdapter) {
227
233
  if (!universalConnectionControllerClient) {
@@ -1 +1 @@
1
- {"version":3,"file":"ChainController.js","sourceRoot":"","sources":["../../../../src/controllers/ChainController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ChainController.js","sourceRoot":"","sources":["../../../../src/controllers/ChainController.ts"],"names":[],"mappings":"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"}
@@ -28,13 +28,14 @@ export const ConnectorController = {
28
28
  const mergedConnectors = [];
29
29
  connectorsByNameMap.forEach(keyConnectors => {
30
30
  const firstItem = keyConnectors[0];
31
+ const isAuthConnector = firstItem?.id === 'w3mAuth';
31
32
  if (keyConnectors.length > 1) {
32
33
  mergedConnectors.push({
33
34
  name: firstItem?.name,
34
35
  imageUrl: firstItem?.imageUrl,
35
36
  imageId: firstItem?.imageId,
36
37
  connectors: [...keyConnectors],
37
- type: 'MULTI_CHAIN',
38
+ type: isAuthConnector ? 'AUTH' : 'MULTI_CHAIN',
38
39
  // These values are just placeholders, we don't use them in multi-chain connector select screen
39
40
  chain: 'eip155',
40
41
  id: firstItem?.id || ''
@@ -110,8 +111,9 @@ export const ConnectorController = {
110
111
  if (!authConnector) {
111
112
  return undefined;
112
113
  }
113
- if (authConnector.type === 'MULTI_CHAIN' && authConnector?.connectors?.length) {
114
- return authConnector.connectors.find(c => c.chain === activeNamespace);
114
+ if (authConnector?.connectors?.length) {
115
+ const connector = authConnector.connectors.find(c => c.chain === activeNamespace);
116
+ return connector;
115
117
  }
116
118
  return authConnector;
117
119
  },
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectorController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectorController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConnectorController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectorController.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { proxy, ref } from 'valtio/vanilla';
2
2
  import { EventsController } from './EventsController.js';
3
3
  import { ModalController } from './ModalController.js';
4
4
  import { CoreHelperUtil } from '../utils/CoreHelperUtil.js';
5
- import { NetworkUtil, SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common';
5
+ import { NetworkUtil } from '@reown/appkit-common';
6
6
  import { ChainController } from './ChainController.js';
7
7
  import { PublicStateController } from './PublicStateController.js';
8
8
  import { ConstantsUtil } from '../utils/ConstantsUtil.js';
@@ -111,30 +111,7 @@ export const NetworkController = {
111
111
  return sortedNetworks;
112
112
  },
113
113
  async switchActiveNetwork(network) {
114
- const sameNamespace = network?.chainNamespace === ChainController.state.activeChain;
115
- let networkControllerClient = undefined;
116
- const isWcConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.WALLET_ID) === 'walletConnect';
117
- const hasWagmiAdapter = ChainController.state.chains.get('eip155')?.adapterType === 'wagmi';
118
- if (isWcConnector && network?.chainNamespace === 'solana') {
119
- if (hasWagmiAdapter) {
120
- networkControllerClient = ChainController.state.chains.get(network.chainNamespace)
121
- ?.networkControllerClient;
122
- }
123
- else {
124
- networkControllerClient = ChainController.state.universalAdapter.networkControllerClient;
125
- }
126
- }
127
- else if (isWcConnector && !hasWagmiAdapter) {
128
- networkControllerClient = ChainController.state.universalAdapter.networkControllerClient;
129
- }
130
- else if (sameNamespace) {
131
- networkControllerClient = ChainController.getNetworkControllerClient();
132
- }
133
- else {
134
- networkControllerClient = network
135
- ? ChainController.state.chains.get(network.chainNamespace)?.networkControllerClient
136
- : undefined;
137
- }
114
+ const networkControllerClient = ChainController.getNetworkControllerClient();
138
115
  await networkControllerClient?.switchCaipNetwork(network);
139
116
  ChainController.setActiveCaipNetwork(network);
140
117
  if (network) {
@@ -162,12 +139,15 @@ export const NetworkController = {
162
139
  return allCaipNetworkIds;
163
140
  },
164
141
  async setApprovedCaipNetworksData(chain) {
142
+ const networkControllerClient = ChainController.getNetworkControllerClient();
143
+ const data = await networkControllerClient?.getApprovedCaipNetworksData();
165
144
  if (!chain) {
166
145
  throw new Error('chain is required to set approved network data');
167
146
  }
168
- const networkControllerClient = ChainController.getNetworkControllerClient();
169
- const data = await networkControllerClient?.getApprovedCaipNetworksData();
170
- ChainController.setChainNetworkData(chain, data);
147
+ ChainController.setChainNetworkData(chain, {
148
+ approvedCaipNetworkIds: data?.approvedCaipNetworkIds,
149
+ supportsAllNetworks: data?.supportsAllNetworks
150
+ });
171
151
  },
172
152
  checkIfSupportedNetwork() {
173
153
  const chain = ChainController.state.activeChain;
@@ -1 +1 @@
1
- {"version":3,"file":"NetworkController.js","sourceRoot":"","sources":["../../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NetworkController.js","sourceRoot":"","sources":["../../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,10 @@
1
- // -- Helpers -----------------------------------------------------------------
2
- const WC_DEEPLINK = 'WALLETCONNECT_DEEPLINK_CHOICE';
3
- const W3M_RECENT = '@w3m/recent';
4
- const W3M_CONNECTED_CONNECTOR = '@w3m/connected_connector';
5
- const W3M_CONNECTED_SOCIAL = '@w3m/connected_social';
6
- const W3M_CONNECTED_SOCIAL_USERNAME = '@w3m-storage/SOCIAL_USERNAME';
1
+ /* eslint-disable no-console */
2
+ import { SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common';
7
3
  // -- Utility -----------------------------------------------------------------
8
4
  export const StorageUtil = {
9
5
  setWalletConnectDeepLink({ href, name }) {
10
6
  try {
11
- localStorage.setItem(WC_DEEPLINK, JSON.stringify({ href, name }));
7
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.DEEPLINK_CHOICE, { href, name });
12
8
  }
13
9
  catch {
14
10
  console.info('Unable to set WalletConnect deep link');
@@ -16,9 +12,9 @@ export const StorageUtil = {
16
12
  },
17
13
  getWalletConnectDeepLink() {
18
14
  try {
19
- const deepLink = localStorage.getItem(WC_DEEPLINK);
15
+ const deepLink = SafeLocalStorage.getItem(SafeLocalStorageKeys.DEEPLINK_CHOICE);
20
16
  if (deepLink) {
21
- return JSON.parse(deepLink);
17
+ return deepLink;
22
18
  }
23
19
  }
24
20
  catch {
@@ -28,7 +24,7 @@ export const StorageUtil = {
28
24
  },
29
25
  deleteWalletConnectDeepLink() {
30
26
  try {
31
- localStorage.removeItem(WC_DEEPLINK);
27
+ SafeLocalStorage.removeItem(SafeLocalStorageKeys.DEEPLINK_CHOICE);
32
28
  }
33
29
  catch {
34
30
  console.info('Unable to delete WalletConnect deep link');
@@ -43,7 +39,7 @@ export const StorageUtil = {
43
39
  if (recentWallets.length > 2) {
44
40
  recentWallets.pop();
45
41
  }
46
- localStorage.setItem(W3M_RECENT, JSON.stringify(recentWallets));
42
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.RECENT_WALLETS, JSON.stringify(recentWallets));
47
43
  }
48
44
  }
49
45
  catch {
@@ -52,7 +48,7 @@ export const StorageUtil = {
52
48
  },
53
49
  getRecentWallets() {
54
50
  try {
55
- const recent = localStorage.getItem(W3M_RECENT);
51
+ const recent = SafeLocalStorage.getItem(SafeLocalStorageKeys.RECENT_WALLETS);
56
52
  return recent ? JSON.parse(recent) : [];
57
53
  }
58
54
  catch {
@@ -62,7 +58,7 @@ export const StorageUtil = {
62
58
  },
63
59
  setConnectedConnector(connectorType) {
64
60
  try {
65
- localStorage.setItem(W3M_CONNECTED_CONNECTOR, connectorType);
61
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR, connectorType);
66
62
  }
67
63
  catch {
68
64
  console.info('Unable to set Connected Connector');
@@ -70,7 +66,7 @@ export const StorageUtil = {
70
66
  },
71
67
  getConnectedConnector() {
72
68
  try {
73
- return localStorage.getItem(W3M_CONNECTED_CONNECTOR);
69
+ return SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR);
74
70
  }
75
71
  catch {
76
72
  console.info('Unable to get Connected Connector');
@@ -79,7 +75,7 @@ export const StorageUtil = {
79
75
  },
80
76
  setConnectedSocialProvider(socialProvider) {
81
77
  try {
82
- localStorage.setItem(W3M_CONNECTED_SOCIAL, socialProvider);
78
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.CONNECTED_SOCIAL, socialProvider);
83
79
  }
84
80
  catch {
85
81
  console.info('Unable to set Connected Social Provider');
@@ -87,7 +83,7 @@ export const StorageUtil = {
87
83
  },
88
84
  getConnectedSocialProvider() {
89
85
  try {
90
- return localStorage.getItem(W3M_CONNECTED_SOCIAL);
86
+ return SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_SOCIAL);
91
87
  }
92
88
  catch {
93
89
  console.info('Unable to get Connected Social Provider');
@@ -96,7 +92,7 @@ export const StorageUtil = {
96
92
  },
97
93
  getConnectedSocialUsername() {
98
94
  try {
99
- return localStorage.getItem(W3M_CONNECTED_SOCIAL_USERNAME);
95
+ return SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_SOCIAL_USERNAME);
100
96
  }
101
97
  catch {
102
98
  console.info('Unable to get Connected Social Username');
@@ -1 +1 @@
1
- {"version":3,"file":"StorageUtil.js","sourceRoot":"","sources":["../../../../src/utils/StorageUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StorageUtil.js","sourceRoot":"","sources":["../../../../src/utils/StorageUtil.ts"],"names":[],"mappings":"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"}
@@ -40,6 +40,13 @@ const announcedConnector = {
40
40
  chain: ConstantsUtil.CHAIN.EVM,
41
41
  name: 'Announced'
42
42
  };
43
+ const announcedConnectorSolana = {
44
+ id: 'announced',
45
+ type: 'ANNOUNCED',
46
+ info: { rdns: 'announced.solana.io' },
47
+ chain: ConstantsUtil.CHAIN.SOLANA,
48
+ name: 'Announced'
49
+ };
43
50
  const syncDappDataSpy = vi.spyOn(authProvider, 'syncDappData');
44
51
  const syncThemeSpy = vi.spyOn(authProvider, 'syncTheme');
45
52
  const mockDappData = {
@@ -149,7 +156,7 @@ describe('ConnectorController', () => {
149
156
  imageId: undefined,
150
157
  imageUrl: undefined,
151
158
  name: 'Auth',
152
- type: 'MULTI_CHAIN',
159
+ type: 'AUTH',
153
160
  chain: 'eip155',
154
161
  connectors: [
155
162
  {
@@ -177,5 +184,55 @@ describe('ConnectorController', () => {
177
184
  announcedConnector
178
185
  ]);
179
186
  });
187
+ it('should merge connectors with the same chain', () => {
188
+ const mergedAnnouncedConnector = {
189
+ id: 'announced',
190
+ imageId: undefined,
191
+ imageUrl: undefined,
192
+ name: 'Announced',
193
+ type: 'MULTI_CHAIN',
194
+ chain: 'eip155',
195
+ connectors: [announcedConnector, announcedConnectorSolana]
196
+ };
197
+ const mergedAuthConnector = {
198
+ id: 'w3mAuth',
199
+ imageId: undefined,
200
+ imageUrl: undefined,
201
+ name: 'Auth',
202
+ type: 'AUTH',
203
+ chain: 'eip155',
204
+ connectors: [
205
+ {
206
+ chain: 'eip155',
207
+ id: 'w3mAuth',
208
+ name: 'Auth',
209
+ provider: {
210
+ syncDappData: syncDappDataSpy,
211
+ syncTheme: syncThemeSpy
212
+ },
213
+ type: 'AUTH'
214
+ },
215
+ {
216
+ chain: 'solana',
217
+ id: 'w3mAuth',
218
+ name: 'Auth',
219
+ provider: {
220
+ syncDappData: syncDappDataSpy,
221
+ syncTheme: syncThemeSpy
222
+ },
223
+ type: 'AUTH'
224
+ }
225
+ ]
226
+ };
227
+ ConnectorController.addConnector(announcedConnectorSolana);
228
+ expect(ConnectorController.getConnectors()).toEqual([
229
+ walletConnectConnector,
230
+ externalConnector,
231
+ metamaskConnector,
232
+ zerionConnector,
233
+ mergedAuthConnector,
234
+ mergedAnnouncedConnector
235
+ ]);
236
+ });
180
237
  });
181
238
  //# sourceMappingURL=ConnectorController.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ConnectorController.test.js","sourceRoot":"","sources":["../../../../tests/controllers/ConnectorController.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConnectorController.test.js","sourceRoot":"","sources":["../../../../tests/controllers/ConnectorController.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EAKlB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAE1E,gFAAgF;AAChF,MAAM,YAAY,GAAG;IACnB,YAAY,EAAE,CAAC,KAAwE,EAAE,EAAE,CACzF,OAAO,CAAC,OAAO,EAAE;IACnB,SAAS,EAAE,CAAC,KAA+D,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;CAClG,CAAA;AAED,MAAM,sBAAsB,GAAG;IAC7B,EAAE,EAAE,eAAe;IACnB,UAAU,EAAE,iBAAiB;IAC7B,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,eAAe;CACb,CAAA;AACV,MAAM,iBAAiB,GAAG;IACxB,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,UAAU;CACR,CAAA;AACV,MAAM,gBAAgB,GAAG;IACvB,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,YAAY;IACtB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,MAAM;CACJ,CAAA;AACV,MAAM,mBAAmB,GAAG;IAC1B,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,YAAY;IACtB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,MAAM;CACJ,CAAA;AAEV,MAAM,kBAAkB,GAAG;IACzB,EAAE,EAAE,WAAW;IACf,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;IAC9B,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,WAAW;CACT,CAAA;AAEV,MAAM,wBAAwB,GAAG;IAC/B,EAAE,EAAE,WAAW;IACf,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE;IACrC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM;IACjC,IAAI,EAAE,WAAW;CACT,CAAA;AAEV,MAAM,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;AAC9D,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;AAExD,MAAM,YAAY,GAAG;IACnB,QAAQ,EAAE;QACR,WAAW,EAAE,MAAM;QACnB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,CAAC,UAAU,CAAC;KACpB;IACD,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,oBAAkC;IAC9C,OAAO,EAAE,QAAQ;CAClB,CAAA;AACD,MAAM,iBAAiB,GAAG;IACxB,EAAE,EAAE,UAAU;IACd,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;IACjC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,UAAU;CACR,CAAA;AACV,MAAM,eAAe,GAAG;IACtB,EAAE,EAAE,kEAAkE;IACtE,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG;IAC9B,IAAI,EAAE,QAAQ;CACN,CAAA;AAEV,gFAAgF;AAChF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,KAAK,CAAC,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAA;IAC7D,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,mBAAmB,CAAC,aAAa,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAA;QAC3D,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAA;IAChF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,mBAAmB,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;QACnD,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACnD,sBAAsB;YACtB,iBAAiB;SAClB,CAAC,CAAA;QAEF,mBAAmB,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;QACnD,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACnD,sBAAsB;YACtB,iBAAiB;YACjB,iBAAiB;SAClB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,mBAAmB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAC3E,sBAAsB,CACvB,CAAA;QACD,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;QAChG,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QAChF,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,SAAS,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,CAAA;QACxD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACpD,iBAAiB,CAAC,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;QACxD,iBAAiB,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QAEtD,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;QAClD,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACnD,sBAAsB;YACtB,iBAAiB;YACjB,iBAAiB;YACjB,eAAe;YACf,gBAAgB;SACjB,CAAC,CAAA;QAEF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC1D,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC;YACxC,SAAS,EAAE,MAAM;YACjB,cAAc,EAAE,EAAE;YAClB,iBAAiB,EAAE,oBAAoB,CAAC,EAAE,EAAE,MAAM,CAAC;SACpD,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACtF,MAAM,SAAS,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,CAAA;QACxD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2FAA2F,EAAE,GAAG,EAAE;QACnG,mBAAmB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAA;QACrD,MAAM,SAAS,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,CAAA;QACxD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,MAAM,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;QACpD,MAAM,CAAC,mBAAmB,CAAC,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC;YAClD,sBAAsB;YACtB,iBAAiB;YACjB,iBAAiB;YACjB,eAAe;YACf,+CAA+C;YAC/C;gBACE,EAAE,EAAE,SAAS;gBACb,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,SAAS;gBACnB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,QAAQ;gBACf,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,QAAQ;wBACf,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE;4BACR,YAAY,EAAE,eAAe;4BAC7B,SAAS,EAAE,YAAY;yBACxB;wBACD,IAAI,EAAE,MAAM;qBACb;oBACD;wBACE,KAAK,EAAE,QAAQ;wBACf,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE;4BACR,YAAY,EAAE,eAAe;4BAC7B,SAAS,EAAE,YAAY;yBACxB;wBACD,IAAI,EAAE,MAAM;qBACb;iBACF;aACF;YACD,kBAAkB;SACnB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,wBAAwB,GAAG;YAC/B,EAAE,EAAE,WAAW;YACf,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,QAAQ;YACf,UAAU,EAAE,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;SAC3D,CAAA;QAED,MAAM,mBAAmB,GAAG;YAC1B,EAAE,EAAE,SAAS;YACb,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,UAAU,EAAE;gBACV;oBACE,KAAK,EAAE,QAAQ;oBACf,EAAE,EAAE,SAAS;oBACb,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACR,YAAY,EAAE,eAAe;wBAC7B,SAAS,EAAE,YAAY;qBACxB;oBACD,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,KAAK,EAAE,QAAQ;oBACf,EAAE,EAAE,SAAS;oBACb,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACR,YAAY,EAAE,eAAe;wBAC7B,SAAS,EAAE,YAAY;qBACxB;oBACD,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAA;QACD,mBAAmB,CAAC,YAAY,CAAC,wBAAwB,CAAC,CAAA;QAC1D,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC;YAClD,sBAAsB;YACtB,iBAAiB;YACjB,iBAAiB;YACjB,eAAe;YACf,mBAAmB;YACnB,wBAAwB;SACzB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
@@ -1,26 +1,34 @@
1
- import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
1
+ import { describe, it, expect, vi, afterEach, beforeEach, beforeAll, afterAll } from 'vitest';
2
2
  import { StorageUtil } from '../../src/utils/StorageUtil';
3
- // Mock localStorage
4
- const localStorageMock = (() => {
5
- let store = {};
6
- return {
7
- getItem: (key) => store[key] || null,
8
- setItem: (key, value) => {
9
- store[key] = value.toString();
10
- },
11
- removeItem: (key) => {
12
- delete store[key];
13
- },
14
- clear: () => {
15
- store = {};
16
- }
17
- };
18
- })();
19
- Object.defineProperty(global, 'localStorage', { value: localStorageMock });
3
+ import { SafeLocalStorage } from '@reown/appkit-common';
4
+ import { SafeLocalStorageKeys } from '@reown/appkit-common';
5
+ const previousLocalStorage = globalThis.localStorage;
6
+ const previousWindow = globalThis.window;
7
+ let store = {};
8
+ afterAll(() => {
9
+ Object.assign(globalThis, { localStorage: previousLocalStorage, window: previousWindow });
10
+ });
20
11
  describe('StorageUtil', () => {
12
+ beforeAll(() => {
13
+ Object.assign(globalThis, {
14
+ window: {},
15
+ localStorage: {
16
+ getItem: (key) => store[key] || null,
17
+ setItem: (key, value) => {
18
+ store[key] = value.toString();
19
+ },
20
+ removeItem: (key) => {
21
+ delete store[key];
22
+ },
23
+ clear: () => {
24
+ store = {};
25
+ }
26
+ }
27
+ });
28
+ });
21
29
  beforeEach(() => {
22
30
  // Clear localStorage before each test
23
- localStorage.clear();
31
+ SafeLocalStorage.clear();
24
32
  });
25
33
  afterEach(() => {
26
34
  // Restore all mocks after each test
@@ -30,7 +38,9 @@ describe('StorageUtil', () => {
30
38
  it('should set WalletConnect deep link in localStorage', () => {
31
39
  const deepLink = { href: 'https://example.com', name: 'Example Wallet' };
32
40
  StorageUtil.setWalletConnectDeepLink(deepLink);
33
- expect(localStorage.getItem('WALLETCONNECT_DEEPLINK_CHOICE')).toBe(JSON.stringify(deepLink));
41
+ const savedDL = SafeLocalStorage.getItem(SafeLocalStorageKeys.DEEPLINK_CHOICE);
42
+ expect(savedDL?.href).toBe(deepLink.href);
43
+ expect(savedDL?.name).toBe(deepLink.name);
34
44
  });
35
45
  it('should handle errors when setting deep link', () => {
36
46
  const consoleSpy = vi.spyOn(console, 'info').mockImplementation(() => { });
@@ -44,7 +54,7 @@ describe('StorageUtil', () => {
44
54
  describe('getWalletConnectDeepLink', () => {
45
55
  it('should get WalletConnect deep link from localStorage', () => {
46
56
  const deepLink = { href: 'https://example.com', name: 'Example Wallet' };
47
- localStorage.setItem('WALLETCONNECT_DEEPLINK_CHOICE', JSON.stringify(deepLink));
57
+ SafeLocalStorage.setItem('@appkit/deeplink_choice', deepLink);
48
58
  expect(StorageUtil.getWalletConnectDeepLink()).toEqual(deepLink);
49
59
  });
50
60
  it('should return undefined if deep link is not set', () => {
@@ -61,9 +71,12 @@ describe('StorageUtil', () => {
61
71
  });
62
72
  describe('deleteWalletConnectDeepLink', () => {
63
73
  it('should delete WalletConnect deep link from localStorage', () => {
64
- localStorage.setItem('WALLETCONNECT_DEEPLINK_CHOICE', JSON.stringify({ href: 'https://example.com', name: 'Example Wallet' }));
74
+ SafeLocalStorage.setItem('@appkit/deeplink_choice', {
75
+ href: 'https://example.com',
76
+ name: 'Example Wallet'
77
+ });
65
78
  StorageUtil.deleteWalletConnectDeepLink();
66
- expect(localStorage.getItem('WALLETCONNECT_DEEPLINK_CHOICE')).toBeNull();
79
+ expect(SafeLocalStorage.getItem('@appkit/deeplink_choice')).toBeUndefined();
67
80
  });
68
81
  it('should handle errors when deleting deep link', () => {
69
82
  const consoleSpy = vi.spyOn(console, 'info').mockImplementation(() => { });
@@ -102,7 +115,7 @@ describe('StorageUtil', () => {
102
115
  });
103
116
  it('should return recent wallets', () => {
104
117
  const wallet = { id: 'wallet1', name: 'Wallet 1' };
105
- localStorage.setItem('@w3m/recent', JSON.stringify([wallet]));
118
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.RECENT_WALLETS, JSON.stringify([wallet]));
106
119
  expect(StorageUtil.getRecentWallets()).toEqual([wallet]);
107
120
  });
108
121
  });
@@ -110,13 +123,13 @@ describe('StorageUtil', () => {
110
123
  it('should set connected connector', () => {
111
124
  const connector = 'INJECTED';
112
125
  StorageUtil.setConnectedConnector(connector);
113
- expect(localStorage.getItem('@w3m/connected_connector')).toBe(connector);
126
+ expect(SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR)).toBe(connector);
114
127
  });
115
128
  });
116
129
  describe('getConnectedConnector', () => {
117
130
  it('should get connected connector', () => {
118
131
  const connector = 'INJECTED';
119
- localStorage.setItem('@w3m/connected_connector', connector);
132
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR, connector);
120
133
  expect(StorageUtil.getConnectedConnector()).toBe(connector);
121
134
  });
122
135
  });
@@ -124,20 +137,20 @@ describe('StorageUtil', () => {
124
137
  it('should set connected social provider', () => {
125
138
  const provider = 'google';
126
139
  StorageUtil.setConnectedSocialProvider(provider);
127
- expect(localStorage.getItem('@w3m/connected_social')).toBe(provider);
140
+ expect(SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_SOCIAL)).toBe(provider);
128
141
  });
129
142
  });
130
143
  describe('getConnectedSocialProvider', () => {
131
144
  it('should get connected social provider', () => {
132
145
  const provider = 'google';
133
- localStorage.setItem('@w3m/connected_social', provider);
146
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.CONNECTED_SOCIAL, provider);
134
147
  expect(StorageUtil.getConnectedSocialProvider()).toBe(provider);
135
148
  });
136
149
  });
137
150
  describe('getConnectedSocialUsername', () => {
138
151
  it('should get connected social username', () => {
139
152
  const username = 'testuser';
140
- localStorage.setItem('@w3m-storage/SOCIAL_USERNAME', username);
153
+ SafeLocalStorage.setItem(SafeLocalStorageKeys.CONNECTED_SOCIAL_USERNAME, username);
141
154
  expect(StorageUtil.getConnectedSocialUsername()).toBe(username);
142
155
  });
143
156
  });