@reown/appkit-utils 1.6.6-rc.1.0 → 1.6.6-rc.2.0
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/dist/esm/exports/index.js +0 -1
- package/dist/esm/exports/index.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/src/MobileWallet.js +22 -10
- package/dist/esm/src/MobileWallet.js.map +1 -1
- package/dist/esm/tests/MobileWallet.test.js +42 -6
- package/dist/esm/tests/MobileWallet.test.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/types/exports/index.d.ts +0 -1
- package/dist/types/src/MobileWallet.d.ts +2 -3
- package/package.json +5 -5
|
@@ -3,7 +3,6 @@ export { PresetsUtil } from '../src/PresetsUtil.js';
|
|
|
3
3
|
export { HelpersUtil } from '../src/HelpersUtil.js';
|
|
4
4
|
export { ErrorUtil } from '../src/ErrorUtil.js';
|
|
5
5
|
export { LoggerUtil } from '../src/LoggerUtil.js';
|
|
6
|
-
export { MobileWalletUtil } from '../src/MobileWallet.js';
|
|
7
6
|
export { CaipNetworksUtil, getBlockchainApiRpcUrl } from '../src/CaipNetworkUtil.js';
|
|
8
7
|
export { SocialProviderEnum } from '../src/TypeUtil.js';
|
|
9
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../exports/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../exports/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAGpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA"}
|
package/dist/esm/package.json
CHANGED
|
@@ -1,15 +1,27 @@
|
|
|
1
|
+
import { ConstantsUtil } from '@reown/appkit-common';
|
|
2
|
+
import { ChainController, ConnectorController, RouterController } from '@reown/appkit-core';
|
|
1
3
|
export const MobileWalletUtil = {
|
|
2
|
-
handleMobileWalletRedirection(
|
|
3
|
-
const
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
handleMobileWalletRedirection(wallet) {
|
|
5
|
+
const connector = ConnectorController.getConnector(wallet.id, wallet.rdns);
|
|
6
|
+
if (ChainController.state.activeChain === ConstantsUtil.CHAIN.SOLANA) {
|
|
7
|
+
const href = window.location.href;
|
|
8
|
+
const encodedHref = encodeURIComponent(href);
|
|
9
|
+
const name = connector?.name || wallet?.name || '';
|
|
10
|
+
if (name === 'Phantom' && !('phantom' in window)) {
|
|
11
|
+
const protocol = href.startsWith('https') ? 'https' : 'http';
|
|
12
|
+
const host = href.split('/')[2];
|
|
13
|
+
const encodedRef = encodeURIComponent(`${protocol}://${host}`);
|
|
14
|
+
window.location.href = `https://phantom.app/ul/browse/${encodedHref}?ref=${encodedRef}`;
|
|
15
|
+
}
|
|
16
|
+
if (name === 'Coinbase Wallet' && !('coinbaseSolana' in window)) {
|
|
17
|
+
window.location.href = `https://go.cb-w.com/dapp?cb_url=${encodedHref}`;
|
|
18
|
+
}
|
|
10
19
|
}
|
|
11
|
-
if (
|
|
12
|
-
|
|
20
|
+
if (connector) {
|
|
21
|
+
RouterController.push('ConnectingExternal', { connector });
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
RouterController.push('ConnectingWalletConnect', { wallet });
|
|
13
25
|
}
|
|
14
26
|
}
|
|
15
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MobileWallet.js","sourceRoot":"","sources":["../../../src/MobileWallet.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAO9B,6BAA6B,CAAC,
|
|
1
|
+
{"version":3,"file":"MobileWallet.js","sourceRoot":"","sources":["../../../src/MobileWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAEjB,MAAM,oBAAoB,CAAA;AAE3B,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAO9B,6BAA6B,CAAC,MAAgB;QAC5C,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAE1E,IAAI,eAAe,CAAC,KAAK,CAAC,WAAW,KAAK,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAMrE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,IAAI,GAAG,SAAS,EAAE,IAAI,IAAI,MAAM,EAAE,IAAI,IAAI,EAAE,CAAA;YAClD,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;gBAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC/B,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,QAAQ,MAAM,IAAI,EAAE,CAAC,CAAA;gBAE9D,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iCAAiC,WAAW,QAAQ,UAAU,EAAE,CAAA;YACzF,CAAC;YAED,IAAI,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC,EAAE,CAAC;gBAChE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,mCAAmC,WAAW,EAAE,CAAA;YACzE,CAAC;QACH,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;QAC5D,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC;CACF,CAAA"}
|
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import {
|
|
2
|
+
import { ChainController, ConnectorController, RouterController } from '@reown/appkit-core';
|
|
3
|
+
import { MobileWalletUtil } from '../../core/src/utils/MobileWallet';
|
|
3
4
|
const ORIGINAL_HREF = 'https://example.com/path';
|
|
4
5
|
const mockWindow = {
|
|
5
6
|
location: {
|
|
6
7
|
href: ORIGINAL_HREF
|
|
7
8
|
}
|
|
8
9
|
};
|
|
10
|
+
const WALLETS = {
|
|
11
|
+
phantom: {
|
|
12
|
+
name: 'Phantom',
|
|
13
|
+
id: 'phantom'
|
|
14
|
+
},
|
|
15
|
+
coinbase: {
|
|
16
|
+
name: 'Coinbase Wallet',
|
|
17
|
+
id: 'cbw'
|
|
18
|
+
}
|
|
19
|
+
};
|
|
9
20
|
describe('MobileWalletUtil', () => {
|
|
10
21
|
beforeEach(() => {
|
|
11
22
|
vi.stubGlobal('window', {
|
|
@@ -13,13 +24,16 @@ describe('MobileWalletUtil', () => {
|
|
|
13
24
|
href: ORIGINAL_HREF
|
|
14
25
|
}
|
|
15
26
|
});
|
|
27
|
+
vi.spyOn(ChainController, 'state', 'get').mockReturnValue({
|
|
28
|
+
activeChain: 'solana'
|
|
29
|
+
});
|
|
16
30
|
});
|
|
17
31
|
afterAll(() => {
|
|
18
32
|
vi.unstubAllGlobals();
|
|
19
33
|
});
|
|
20
34
|
describe('handleMobileWalletRedirection', () => {
|
|
21
35
|
it('should redirect to Phantom app when Phantom is not installed', () => {
|
|
22
|
-
MobileWalletUtil.handleMobileWalletRedirection(
|
|
36
|
+
MobileWalletUtil.handleMobileWalletRedirection(WALLETS.phantom);
|
|
23
37
|
const encodedHref = encodeURIComponent(ORIGINAL_HREF);
|
|
24
38
|
const encodedRef = encodeURIComponent('https://example.com');
|
|
25
39
|
const expectedUrl = `https://phantom.app/ul/browse/${encodedHref}?ref=${encodedRef}`;
|
|
@@ -31,11 +45,11 @@ describe('MobileWalletUtil', () => {
|
|
|
31
45
|
phantom: {}
|
|
32
46
|
});
|
|
33
47
|
const originalHref = window.location.href;
|
|
34
|
-
MobileWalletUtil.handleMobileWalletRedirection(
|
|
48
|
+
MobileWalletUtil.handleMobileWalletRedirection(WALLETS.phantom);
|
|
35
49
|
expect(window.location.href).toBe(originalHref);
|
|
36
50
|
});
|
|
37
51
|
it('should redirect to Coinbase Wallet when it is not installed', () => {
|
|
38
|
-
MobileWalletUtil.handleMobileWalletRedirection(
|
|
52
|
+
MobileWalletUtil.handleMobileWalletRedirection(WALLETS.coinbase);
|
|
39
53
|
const encodedHref = encodeURIComponent(ORIGINAL_HREF);
|
|
40
54
|
const expectedUrl = `https://go.cb-w.com/dapp?cb_url=${encodedHref}`;
|
|
41
55
|
expect(window.location.href).toBe(expectedUrl);
|
|
@@ -46,14 +60,36 @@ describe('MobileWalletUtil', () => {
|
|
|
46
60
|
coinbaseSolana: {}
|
|
47
61
|
});
|
|
48
62
|
const originalHref = window.location.href;
|
|
49
|
-
MobileWalletUtil.handleMobileWalletRedirection(
|
|
63
|
+
MobileWalletUtil.handleMobileWalletRedirection(WALLETS.coinbase);
|
|
50
64
|
expect(window.location.href).toBe(originalHref);
|
|
51
65
|
});
|
|
52
66
|
it('should not redirect for unknown wallet names', () => {
|
|
53
67
|
const originalHref = window.location.href;
|
|
54
|
-
MobileWalletUtil.handleMobileWalletRedirection({ name: 'Unknown
|
|
68
|
+
MobileWalletUtil.handleMobileWalletRedirection({ name: 'Unknown', id: 'unknown' });
|
|
55
69
|
expect(window.location.href).toBe(originalHref);
|
|
56
70
|
});
|
|
71
|
+
it('should route to ConnectingExternal if there is a connector', () => {
|
|
72
|
+
const mockConnector = {
|
|
73
|
+
id: 'connector',
|
|
74
|
+
name: 'Connector',
|
|
75
|
+
type: 'INJECTED',
|
|
76
|
+
chain: 'solana'
|
|
77
|
+
};
|
|
78
|
+
vi.spyOn(ConnectorController, 'getConnector').mockReturnValue(mockConnector);
|
|
79
|
+
vi.spyOn(RouterController, 'push');
|
|
80
|
+
MobileWalletUtil.handleMobileWalletRedirection({ name: 'Connector', id: 'connector' });
|
|
81
|
+
expect(RouterController.push).toHaveBeenCalledWith('ConnectingExternal', {
|
|
82
|
+
connector: mockConnector
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
it('should route to ConnectingWalletConnect if there is not a connector', () => {
|
|
86
|
+
vi.spyOn(ConnectorController, 'getConnector').mockReturnValue(undefined);
|
|
87
|
+
vi.spyOn(RouterController, 'push');
|
|
88
|
+
MobileWalletUtil.handleMobileWalletRedirection({ name: 'WalletConnect', id: 'wc' });
|
|
89
|
+
expect(RouterController.push).toHaveBeenCalledWith('ConnectingWalletConnect', {
|
|
90
|
+
wallet: { name: 'WalletConnect', id: 'wc' }
|
|
91
|
+
});
|
|
92
|
+
});
|
|
57
93
|
});
|
|
58
94
|
});
|
|
59
95
|
//# sourceMappingURL=MobileWallet.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MobileWallet.test.js","sourceRoot":"","sources":["../../../tests/MobileWallet.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"MobileWallet.test.js","sourceRoot":"","sources":["../../../tests/MobileWallet.test.ts"],"names":[],"mappings":"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"}
|