@ledgerhq/live-common 34.37.0 → 34.38.0-next.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/lib/e2e/index.d.ts +4 -0
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/e2e/speculos.d.ts.map +1 -1
- package/lib/e2e/speculos.js +3 -0
- package/lib/e2e/speculos.js.map +1 -1
- package/lib/e2e/speculosCI.js +1 -1
- package/lib/exchange/providers/swap.d.ts +1 -0
- package/lib/exchange/providers/swap.d.ts.map +1 -1
- package/lib/exchange/providers/swap.integration.test.js +26 -12
- package/lib/exchange/providers/swap.integration.test.js.map +1 -1
- package/lib/exchange/providers/swap.js +25 -0
- package/lib/exchange/providers/swap.js.map +1 -1
- package/lib/families/evm/config.js +2 -2
- package/lib/families/evm/config.js.map +1 -1
- package/lib/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.js +10 -0
- package/lib/featureFlags/defaultFeatures.js.map +1 -1
- package/lib/featureFlags/stakePrograms/index.d.ts +8 -2
- package/lib/featureFlags/stakePrograms/index.d.ts.map +1 -1
- package/lib/featureFlags/stakePrograms/index.js +3 -2
- package/lib/featureFlags/stakePrograms/index.js.map +1 -1
- package/lib/featureFlags/stakePrograms/index.test.js +4 -4
- package/lib/featureFlags/stakePrograms/index.test.js.map +1 -1
- package/lib/featureFlags/useFeature.d.ts +1 -1
- package/lib/featureFlags/useFeature.d.ts.map +1 -1
- package/lib/hooks/useOFACGeoBlockCheck.js +1 -1
- package/lib/hooks/useOFACGeoBlockCheck.js.map +1 -1
- package/lib/hooks/useShowProviderLoadingTransition.d.ts +9 -0
- package/lib/hooks/useShowProviderLoadingTransition.d.ts.map +1 -0
- package/lib/hooks/useShowProviderLoadingTransition.js +46 -0
- package/lib/hooks/useShowProviderLoadingTransition.js.map +1 -0
- package/lib/hooks/useShowProviderLoadingTransition.test.d.ts +5 -0
- package/lib/hooks/useShowProviderLoadingTransition.test.d.ts.map +1 -0
- package/lib/hooks/useShowProviderLoadingTransition.test.js +83 -0
- package/lib/hooks/useShowProviderLoadingTransition.test.js.map +1 -0
- package/lib/wallet-api/Exchange/server.d.ts +2 -0
- package/lib/wallet-api/Exchange/server.d.ts.map +1 -1
- package/lib/wallet-api/Exchange/server.js +6 -0
- package/lib/wallet-api/Exchange/server.js.map +1 -1
- package/lib/wallet-api/ModularDrawer/types.d.ts +30 -25
- package/lib/wallet-api/ModularDrawer/types.d.ts.map +1 -1
- package/lib/wallet-api/ModularDrawer/types.js +15 -11
- package/lib/wallet-api/ModularDrawer/types.js.map +1 -1
- package/lib/wallet-api/ModularDrawer/utils.js +1 -1
- package/lib/wallet-api/ModularDrawer/utils.js.map +1 -1
- package/lib-es/e2e/index.d.ts +4 -0
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/e2e/speculos.d.ts.map +1 -1
- package/lib-es/e2e/speculos.js +3 -0
- package/lib-es/e2e/speculos.js.map +1 -1
- package/lib-es/e2e/speculosCI.js +1 -1
- package/lib-es/exchange/providers/swap.d.ts +1 -0
- package/lib-es/exchange/providers/swap.d.ts.map +1 -1
- package/lib-es/exchange/providers/swap.integration.test.js +27 -13
- package/lib-es/exchange/providers/swap.integration.test.js.map +1 -1
- package/lib-es/exchange/providers/swap.js +25 -0
- package/lib-es/exchange/providers/swap.js.map +1 -1
- package/lib-es/families/evm/config.js +2 -2
- package/lib-es/families/evm/config.js.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.js +10 -0
- package/lib-es/featureFlags/defaultFeatures.js.map +1 -1
- package/lib-es/featureFlags/stakePrograms/index.d.ts +8 -2
- package/lib-es/featureFlags/stakePrograms/index.d.ts.map +1 -1
- package/lib-es/featureFlags/stakePrograms/index.js +3 -2
- package/lib-es/featureFlags/stakePrograms/index.js.map +1 -1
- package/lib-es/featureFlags/stakePrograms/index.test.js +4 -4
- package/lib-es/featureFlags/stakePrograms/index.test.js.map +1 -1
- package/lib-es/featureFlags/useFeature.d.ts +1 -1
- package/lib-es/featureFlags/useFeature.d.ts.map +1 -1
- package/lib-es/hooks/useOFACGeoBlockCheck.js +1 -1
- package/lib-es/hooks/useOFACGeoBlockCheck.js.map +1 -1
- package/lib-es/hooks/useShowProviderLoadingTransition.d.ts +9 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.d.ts.map +1 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.js +41 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.js.map +1 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.test.d.ts +5 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.test.d.ts.map +1 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.test.js +81 -0
- package/lib-es/hooks/useShowProviderLoadingTransition.test.js.map +1 -0
- package/lib-es/wallet-api/Exchange/server.d.ts +2 -0
- package/lib-es/wallet-api/Exchange/server.d.ts.map +1 -1
- package/lib-es/wallet-api/Exchange/server.js +6 -0
- package/lib-es/wallet-api/Exchange/server.js.map +1 -1
- package/lib-es/wallet-api/ModularDrawer/types.d.ts +30 -25
- package/lib-es/wallet-api/ModularDrawer/types.d.ts.map +1 -1
- package/lib-es/wallet-api/ModularDrawer/types.js +9 -5
- package/lib-es/wallet-api/ModularDrawer/types.js.map +1 -1
- package/lib-es/wallet-api/ModularDrawer/utils.js +1 -1
- package/lib-es/wallet-api/ModularDrawer/utils.js.map +1 -1
- package/package.json +68 -68
- package/src/e2e/speculos.ts +3 -0
- package/src/e2e/speculosCI.ts +1 -1
- package/src/exchange/providers/swap.integration.test.ts +33 -16
- package/src/exchange/providers/swap.ts +32 -0
- package/src/families/evm/config.ts +2 -2
- package/src/featureFlags/defaultFeatures.ts +12 -0
- package/src/featureFlags/stakePrograms/index.test.ts +4 -4
- package/src/featureFlags/stakePrograms/index.ts +5 -6
- package/src/hooks/useOFACGeoBlockCheck.ts +1 -1
- package/src/hooks/useShowProviderLoadingTransition.test.ts +112 -0
- package/src/hooks/useShowProviderLoadingTransition.ts +57 -0
- package/src/wallet-api/Exchange/server.ts +8 -0
- package/src/wallet-api/ModularDrawer/types.ts +9 -5
- package/src/wallet-api/ModularDrawer/utils.ts +1 -1
@@ -0,0 +1,41 @@
|
|
1
|
+
import { useEffect, useRef, useState } from "react";
|
2
|
+
import { useFeature } from "../featureFlags/index";
|
3
|
+
import { INTERNAL_APP_IDS } from "../wallet-api/constants";
|
4
|
+
import { useInternalAppIds } from "./useInternalAppIds";
|
5
|
+
export function useShowProviderLoadingTransition({ isLoading, manifest, }) {
|
6
|
+
const isEnabled = useProviderInterstitalEnabled({ manifest });
|
7
|
+
const [extendedInitialLoading, setExtendedInitialLoading] = useState(false);
|
8
|
+
const timeoutRef = useRef(null);
|
9
|
+
const buySellLoaderFF = useFeature("buySellLoader");
|
10
|
+
const durationMs = buySellLoaderFF?.params?.durationMs ?? 0;
|
11
|
+
const internalAppIds = useInternalAppIds() || INTERNAL_APP_IDS;
|
12
|
+
const isAppInternal = internalAppIds.includes(manifest.id);
|
13
|
+
useEffect(() => {
|
14
|
+
if (isEnabled && isLoading && !extendedInitialLoading) {
|
15
|
+
setExtendedInitialLoading(true);
|
16
|
+
if (timeoutRef.current)
|
17
|
+
clearTimeout(timeoutRef.current);
|
18
|
+
timeoutRef.current = setTimeout(() => {
|
19
|
+
setExtendedInitialLoading(false);
|
20
|
+
}, durationMs);
|
21
|
+
}
|
22
|
+
}, [durationMs, extendedInitialLoading, isAppInternal, isEnabled, isLoading]);
|
23
|
+
useEffect(() => {
|
24
|
+
return () => {
|
25
|
+
if (timeoutRef.current)
|
26
|
+
clearTimeout(timeoutRef.current);
|
27
|
+
};
|
28
|
+
}, []);
|
29
|
+
return isEnabled && (isLoading || extendedInitialLoading);
|
30
|
+
}
|
31
|
+
export function useProviderInterstitalEnabled({ manifest }) {
|
32
|
+
const buySellLoaderFF = useFeature("buySellLoader");
|
33
|
+
const internalAppIds = useInternalAppIds() || INTERNAL_APP_IDS;
|
34
|
+
if (!manifest) {
|
35
|
+
return false;
|
36
|
+
}
|
37
|
+
const isAppInternal = internalAppIds.includes(manifest.id);
|
38
|
+
const isEnabled = buySellLoaderFF?.enabled && !isAppInternal;
|
39
|
+
return isEnabled;
|
40
|
+
}
|
41
|
+
//# sourceMappingURL=useShowProviderLoadingTransition.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useShowProviderLoadingTransition.js","sourceRoot":"","sources":["../../src/hooks/useShowProviderLoadingTransition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,MAAM,UAAU,gCAAgC,CAAC,EAC/C,SAAS,EACT,QAAQ,GAIT;IACC,MAAM,SAAS,GAAG,6BAA6B,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9D,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5E,MAAM,UAAU,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,eAAe,EAAE,MAAM,EAAE,UAAU,IAAI,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,iBAAiB,EAAE,IAAI,gBAAgB,CAAC;IAC/D,MAAM,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE3D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,IAAI,SAAS,IAAI,CAAC,sBAAsB,EAAE;YACrD,yBAAyB,CAAC,IAAI,CAAC,CAAC;YAEhC,IAAI,UAAU,CAAC,OAAO;gBAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAEzD,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBACnC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC,EAAE,UAAU,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,UAAU,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAE9E,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,IAAI,UAAU,CAAC,OAAO;gBAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,SAAS,IAAI,CAAC,SAAS,IAAI,sBAAsB,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,EAAE,QAAQ,EAAkC;IACxF,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,iBAAiB,EAAE,IAAI,gBAAgB,CAAC;IAE/D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,CAAC;KACd;IAED,MAAM,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,eAAe,EAAE,OAAO,IAAI,CAAC,aAAa,CAAC;IAE7D,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useShowProviderLoadingTransition.test.d.ts","sourceRoot":"","sources":["../../src/hooks/useShowProviderLoadingTransition.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
@@ -0,0 +1,81 @@
|
|
1
|
+
/**
|
2
|
+
* @jest-environment jsdom
|
3
|
+
*/
|
4
|
+
import { renderHook } from "@testing-library/react";
|
5
|
+
import { INTERNAL_APP_IDS } from "../wallet-api/constants";
|
6
|
+
import { useFeature } from "../featureFlags";
|
7
|
+
import { useInternalAppIds } from "./useInternalAppIds";
|
8
|
+
import { useShowProviderLoadingTransition } from "./useShowProviderLoadingTransition";
|
9
|
+
jest.mock("../featureFlags", () => ({
|
10
|
+
useFeature: jest.fn(),
|
11
|
+
}));
|
12
|
+
jest.mock("../wallet-api/constants", () => ({
|
13
|
+
INTERNAL_APP_IDS: ["internal-app-id-1", "internal-app-id-2"],
|
14
|
+
}));
|
15
|
+
jest.mock("./useInternalAppIds", () => ({
|
16
|
+
useInternalAppIds: jest.fn(),
|
17
|
+
}));
|
18
|
+
describe("useShowProviderLoadingTransition", () => {
|
19
|
+
const mockUseFeature = useFeature;
|
20
|
+
const mockUseInternalAppIds = useInternalAppIds;
|
21
|
+
beforeEach(() => {
|
22
|
+
jest.clearAllMocks();
|
23
|
+
});
|
24
|
+
it("should return false when feature is disabled", () => {
|
25
|
+
mockUseFeature.mockReturnValue({ enabled: false, params: {} });
|
26
|
+
const { result } = renderHook(() => useShowProviderLoadingTransition({
|
27
|
+
manifest: { id: "test-app-id" },
|
28
|
+
isLoading: true,
|
29
|
+
}));
|
30
|
+
expect(result.current).toBe(false);
|
31
|
+
});
|
32
|
+
it("should return false for internal apps", () => {
|
33
|
+
mockUseFeature.mockReturnValue({ enabled: true, params: {} });
|
34
|
+
mockUseInternalAppIds.mockReturnValue(INTERNAL_APP_IDS);
|
35
|
+
const { result } = renderHook(() => useShowProviderLoadingTransition({
|
36
|
+
manifest: { id: "internal-app-id-1" },
|
37
|
+
isLoading: true,
|
38
|
+
}));
|
39
|
+
expect(result.current).toBe(false);
|
40
|
+
});
|
41
|
+
it("should return true when loading and feature is enabled", () => {
|
42
|
+
mockUseFeature.mockReturnValue({ enabled: true, params: {} });
|
43
|
+
mockUseInternalAppIds.mockReturnValue([]);
|
44
|
+
const { result } = renderHook(() => useShowProviderLoadingTransition({
|
45
|
+
manifest: { id: "test-app-id" },
|
46
|
+
isLoading: true,
|
47
|
+
}));
|
48
|
+
expect(result.current).toBe(true);
|
49
|
+
});
|
50
|
+
it("should handle extended loading state", () => {
|
51
|
+
jest.useFakeTimers();
|
52
|
+
mockUseFeature.mockReturnValue({ enabled: true, params: { durationMs: 1000 } });
|
53
|
+
mockUseInternalAppIds.mockReturnValue([]);
|
54
|
+
const { result, rerender } = renderHook(({ isLoading }) => useShowProviderLoadingTransition({
|
55
|
+
manifest: { id: "test-app-id" },
|
56
|
+
isLoading,
|
57
|
+
}), {
|
58
|
+
initialProps: { isLoading: true },
|
59
|
+
});
|
60
|
+
expect(result.current).toBe(true);
|
61
|
+
// Simulate the timeout
|
62
|
+
jest.advanceTimersByTime(1000);
|
63
|
+
rerender({ isLoading: false });
|
64
|
+
expect(result.current).toBe(false);
|
65
|
+
jest.useRealTimers();
|
66
|
+
});
|
67
|
+
it("should clear timeout on unmount", () => {
|
68
|
+
jest.useFakeTimers();
|
69
|
+
mockUseFeature.mockReturnValue({ enabled: true, params: { durationMs: 1000 } });
|
70
|
+
mockUseInternalAppIds.mockReturnValue([]);
|
71
|
+
const { unmount } = renderHook(() => useShowProviderLoadingTransition({
|
72
|
+
manifest: { id: "test-app-id" },
|
73
|
+
isLoading: true,
|
74
|
+
}));
|
75
|
+
unmount();
|
76
|
+
// Advance timers to ensure no memory leaks
|
77
|
+
jest.advanceTimersByTime(1000);
|
78
|
+
jest.useRealTimers();
|
79
|
+
});
|
80
|
+
});
|
81
|
+
//# sourceMappingURL=useShowProviderLoadingTransition.test.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"useShowProviderLoadingTransition.test.js","sourceRoot":"","sources":["../../src/hooks/useShowProviderLoadingTransition.test.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,6BAA6B,CAAC;AAaxE,OAAO,EAAE,WAAW,EAAuC,MAAM,sBAAsB,CAAC;AAExF,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EAEnB,mBAAmB,EACnB,YAAY,EAEZ,aAAa,EACd,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQpD,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAYzC,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,SAAS,CAAC;
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,6BAA6B,CAAC;AAaxE,OAAO,EAAE,WAAW,EAAuC,MAAM,sBAAsB,CAAC;AAExF,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EAEnB,mBAAmB,EACnB,YAAY,EAEZ,aAAa,EACd,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQpD,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAYzC,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,4BAA4B,GAC7B;IACE,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;CACzC,GACD;IACE,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC7B,CAAC;AAEN,KAAK,eAAe,GAAG;IACrB,uBAAuB,EAAE,CAAC,MAAM,EAAE;QAChC,cAAc,EAAE,4BAA4B,CAAC;QAC7C,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;QAC3E,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;KAC1E,KAAK,IAAI,CAAC;IACX,0BAA0B,EAAE,CAAC,MAAM,EAAE;QACnC,cAAc,EAAE,yBAAyB,CAAC;QAC1C,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KAClC,KAAK,IAAI,CAAC;IACX,uBAAuB,EAAE,CAAC,MAAM,EAAE;QAChC,KAAK,EAAE,aAAa,GAAG,SAAS,CAAC;QACjC,SAAS,EAAE,MAAM,IAAI,CAAC;QACtB,QAAQ,EAAE,MAAM,IAAI,CAAC;KACtB,KAAK,IAAI,CAAC;IACX,gBAAgB,EAAE,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,IAAI,CAAC;CACrF,CAAC;AAEF,eAAO,MAAM,QAAQ;cAWT,WAAW,EAAE;cACb,WAAW;cACX,WAAW;aACZ,eAAe;;;;;;CA8OM,CAAC"}
|
@@ -143,11 +143,15 @@ export const handlers = ({ accounts, tracking, manifest, uiHooks: { "custom.exch
|
|
143
143
|
});
|
144
144
|
let amountExpectedTo;
|
145
145
|
let magnitudeAwareRate;
|
146
|
+
let refundAddress;
|
147
|
+
let payoutAddress;
|
146
148
|
if (params.exchangeType === "SWAP") {
|
147
149
|
// Get amountExpectedTo and magnitudeAwareRate from binary payload
|
148
150
|
const decodePayload = await decodeSwapPayload(params.hexBinaryPayload);
|
149
151
|
amountExpectedTo = new BigNumber(decodePayload.amountToWallet.toString());
|
150
152
|
magnitudeAwareRate = tx.amount && amountExpectedTo.dividedBy(tx.amount);
|
153
|
+
refundAddress = decodePayload.refundAddress;
|
154
|
+
payoutAddress = decodePayload.payoutAddress;
|
151
155
|
}
|
152
156
|
return new Promise((resolve, reject) => uiExchangeComplete({
|
153
157
|
exchangeParams: {
|
@@ -161,6 +165,8 @@ export const handlers = ({ accounts, tracking, manifest, uiHooks: { "custom.exch
|
|
161
165
|
swapId: params.exchangeType === "SWAP" ? params.swapId : undefined,
|
162
166
|
amountExpectedTo,
|
163
167
|
magnitudeAwareRate,
|
168
|
+
refundAddress,
|
169
|
+
payoutAddress,
|
164
170
|
},
|
165
171
|
onSuccess: (transactionHash) => {
|
166
172
|
tracking.completeExchangeSuccess({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAc,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,qBAAqB,GACtB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAe,qBAAqB,EAAgB,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAML,YAAY,GAGb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EACL,+BAA+B,EAC/B,oCAAoC,GACrC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/wallet-api/Exchange/server.ts"],"names":[],"mappings":"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"}
|
@@ -10,49 +10,54 @@ export type ModularDrawerConfiguration = {
|
|
10
10
|
leftElement?: string;
|
11
11
|
};
|
12
12
|
};
|
13
|
+
export declare const filterOptions: readonly ["topNetworks", "undefined"];
|
14
|
+
export declare const assetsLeftElementOptions: readonly ["apy", "priceVariation", "undefined"];
|
15
|
+
export declare const assetsRightElementOptions: readonly ["balance", "marketTrend", "undefined"];
|
16
|
+
export declare const networksLeftElementOptions: readonly ["numberOfAccounts", "numberOfAccountsAndApy", "undefined"];
|
17
|
+
export declare const networksRightElementOptions: readonly ["balance", "undefined"];
|
13
18
|
export declare const EnhancedModularDrawerConfigurationSchema: z.ZodObject<{
|
14
19
|
assets: z.ZodOptional<z.ZodObject<{
|
15
|
-
filter: z.ZodOptional<z.ZodEnum<["topNetworks"]>>;
|
16
|
-
leftElement: z.ZodOptional<z.ZodEnum<["apy", "priceVariation"]>>;
|
17
|
-
rightElement: z.ZodOptional<z.ZodEnum<["balance", "marketTrend"]>>;
|
20
|
+
filter: z.ZodOptional<z.ZodEnum<["topNetworks", "undefined"]>>;
|
21
|
+
leftElement: z.ZodOptional<z.ZodEnum<["apy", "priceVariation", "undefined"]>>;
|
22
|
+
rightElement: z.ZodOptional<z.ZodEnum<["balance", "marketTrend", "undefined"]>>;
|
18
23
|
}, "strip", z.ZodTypeAny, {
|
19
|
-
filter?: "topNetworks" | undefined;
|
20
|
-
leftElement?: "apy" | "priceVariation" | undefined;
|
21
|
-
rightElement?: "balance" | "marketTrend" | undefined;
|
24
|
+
filter?: "undefined" | "topNetworks" | undefined;
|
25
|
+
leftElement?: "undefined" | "apy" | "priceVariation" | undefined;
|
26
|
+
rightElement?: "undefined" | "balance" | "marketTrend" | undefined;
|
22
27
|
}, {
|
23
|
-
filter?: "topNetworks" | undefined;
|
24
|
-
leftElement?: "apy" | "priceVariation" | undefined;
|
25
|
-
rightElement?: "balance" | "marketTrend" | undefined;
|
28
|
+
filter?: "undefined" | "topNetworks" | undefined;
|
29
|
+
leftElement?: "undefined" | "apy" | "priceVariation" | undefined;
|
30
|
+
rightElement?: "undefined" | "balance" | "marketTrend" | undefined;
|
26
31
|
}>>;
|
27
32
|
networks: z.ZodOptional<z.ZodObject<{
|
28
|
-
leftElement: z.ZodOptional<z.ZodEnum<["numberOfAccounts", "numberOfAccountsAndApy"]>>;
|
29
|
-
rightElement: z.ZodOptional<z.ZodEnum<["balance"]>>;
|
33
|
+
leftElement: z.ZodOptional<z.ZodEnum<["numberOfAccounts", "numberOfAccountsAndApy", "undefined"]>>;
|
34
|
+
rightElement: z.ZodOptional<z.ZodEnum<["balance", "undefined"]>>;
|
30
35
|
}, "strip", z.ZodTypeAny, {
|
31
|
-
leftElement?: "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
32
|
-
rightElement?: "balance" | undefined;
|
36
|
+
leftElement?: "undefined" | "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
37
|
+
rightElement?: "undefined" | "balance" | undefined;
|
33
38
|
}, {
|
34
|
-
leftElement?: "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
35
|
-
rightElement?: "balance" | undefined;
|
39
|
+
leftElement?: "undefined" | "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
40
|
+
rightElement?: "undefined" | "balance" | undefined;
|
36
41
|
}>>;
|
37
42
|
}, "strip", z.ZodTypeAny, {
|
38
43
|
networks?: {
|
39
|
-
leftElement?: "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
40
|
-
rightElement?: "balance" | undefined;
|
44
|
+
leftElement?: "undefined" | "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
45
|
+
rightElement?: "undefined" | "balance" | undefined;
|
41
46
|
} | undefined;
|
42
47
|
assets?: {
|
43
|
-
filter?: "topNetworks" | undefined;
|
44
|
-
leftElement?: "apy" | "priceVariation" | undefined;
|
45
|
-
rightElement?: "balance" | "marketTrend" | undefined;
|
48
|
+
filter?: "undefined" | "topNetworks" | undefined;
|
49
|
+
leftElement?: "undefined" | "apy" | "priceVariation" | undefined;
|
50
|
+
rightElement?: "undefined" | "balance" | "marketTrend" | undefined;
|
46
51
|
} | undefined;
|
47
52
|
}, {
|
48
53
|
networks?: {
|
49
|
-
leftElement?: "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
50
|
-
rightElement?: "balance" | undefined;
|
54
|
+
leftElement?: "undefined" | "numberOfAccounts" | "numberOfAccountsAndApy" | undefined;
|
55
|
+
rightElement?: "undefined" | "balance" | undefined;
|
51
56
|
} | undefined;
|
52
57
|
assets?: {
|
53
|
-
filter?: "topNetworks" | undefined;
|
54
|
-
leftElement?: "apy" | "priceVariation" | undefined;
|
55
|
-
rightElement?: "balance" | "marketTrend" | undefined;
|
58
|
+
filter?: "undefined" | "topNetworks" | undefined;
|
59
|
+
leftElement?: "undefined" | "apy" | "priceVariation" | undefined;
|
60
|
+
rightElement?: "undefined" | "balance" | "marketTrend" | undefined;
|
56
61
|
} | undefined;
|
57
62
|
}>;
|
58
63
|
/**
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,QAAQ,CAAC,EAAE;QACT,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH,CAAC;
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,QAAQ,CAAC,EAAE;QACT,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,aAAa,uCAAwC,CAAC;AACnE,eAAO,MAAM,wBAAwB,iDAAkD,CAAC;AACxF,eAAO,MAAM,yBAAyB,kDAAmD,CAAC;AAC1F,eAAO,MAAM,0BAA0B,sEAI7B,CAAC;AACX,eAAO,MAAM,2BAA2B,mCAAoC,CAAC;AAE7E,eAAO,MAAM,wCAAwC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcnD,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,IAAI,CACnD,0BAA0B,EAC1B,QAAQ,GAAG,UAAU,CACtB,GACC,CAAC,CAAC,KAAK,CAAC,OAAO,wCAAwC,CAAC,CAAC"}
|
@@ -1,9 +1,13 @@
|
|
1
1
|
import { z } from "zod";
|
2
|
-
const filterOptions = ["topNetworks"];
|
3
|
-
const assetsLeftElementOptions = ["apy", "priceVariation"];
|
4
|
-
const assetsRightElementOptions = ["balance", "marketTrend"];
|
5
|
-
const networksLeftElementOptions = [
|
6
|
-
|
2
|
+
export const filterOptions = ["topNetworks", "undefined"];
|
3
|
+
export const assetsLeftElementOptions = ["apy", "priceVariation", "undefined"];
|
4
|
+
export const assetsRightElementOptions = ["balance", "marketTrend", "undefined"];
|
5
|
+
export const networksLeftElementOptions = [
|
6
|
+
"numberOfAccounts",
|
7
|
+
"numberOfAccountsAndApy",
|
8
|
+
"undefined",
|
9
|
+
];
|
10
|
+
export const networksRightElementOptions = ["balance", "undefined"];
|
7
11
|
export const EnhancedModularDrawerConfigurationSchema = z.object({
|
8
12
|
assets: z
|
9
13
|
.object({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,MAAM,aAAa,GAAG,CAAC,aAAa,CAAU,CAAC;
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,aAAa,EAAE,WAAW,CAAU,CAAC;AACnE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,WAAW,CAAU,CAAC;AACxF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE,WAAW,CAAU,CAAC;AAC1F,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,kBAAkB;IAClB,wBAAwB;IACxB,WAAW;CACH,CAAC;AACX,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,SAAS,EAAE,WAAW,CAAU,CAAC;AAE7E,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/D,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;QACxC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE;QACxD,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE;KAC3D,CAAC;SACD,QAAQ,EAAE;IACb,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,QAAQ,EAAE;QAC1D,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,QAAQ,EAAE;KAC7D,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC"}
|
@@ -10,7 +10,7 @@ export const defaultDrawerConfiguration = {
|
|
10
10
|
export function validateAndTransformConfigurationWithZod(config) {
|
11
11
|
const result = EnhancedModularDrawerConfigurationSchema.safeParse(config);
|
12
12
|
if (!result.success) {
|
13
|
-
console.warn("
|
13
|
+
console.warn("Modular Drawer invalid configuration received:", result.error);
|
14
14
|
return {};
|
15
15
|
}
|
16
16
|
return result.data;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,wCAAwC,GACzC,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAuC;IAC5E,MAAM,EAAE;QACN,YAAY,EAAE,SAAS;KACxB;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,kBAAkB;KAChC;CACF,CAAC;AAEF,MAAM,UAAU,wCAAwC,CACtD,MAAwE;IAExE,MAAM,MAAM,GAAG,wCAAwC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE1E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,OAAO,CAAC,IAAI,CAAC,
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/wallet-api/ModularDrawer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,wCAAwC,GACzC,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,MAAM,0BAA0B,GAAuC;IAC5E,MAAM,EAAE;QACN,YAAY,EAAE,SAAS;KACxB;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,kBAAkB;KAChC;CACF,CAAC;AAEF,MAAM,UAAU,wCAAwC,CACtD,MAAwE;IAExE,MAAM,MAAM,GAAG,wCAAwC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE1E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,OAAO,CAAC,IAAI,CAAC,gDAAgD,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7E,OAAO,EAAE,CAAC;KACX;IAED,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,MAAwE;IAExE,MAAM,eAAe,GAAG,wCAAwC,CAAC,MAAM,CAAC,CAAC;IACzE,OAAO;QACL,GAAG,0BAA0B;QAC7B,GAAG,eAAe;KAC0B,CAAC;AACjD,CAAC"}
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@ledgerhq/live-common",
|
3
3
|
"description": "Common ground for the Ledger Live apps",
|
4
|
-
"version": "34.
|
4
|
+
"version": "34.38.0-next.0",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
7
7
|
"url": "https://github.com/LedgerHQ/ledger-live.git"
|
@@ -139,7 +139,7 @@
|
|
139
139
|
"fuse.js": "^6.6.2",
|
140
140
|
"invariant": "^2.2.2",
|
141
141
|
"isomorphic-ws": "^4.0.1",
|
142
|
-
"jotai": "
|
142
|
+
"jotai": "2.12.4",
|
143
143
|
"json-rpc-2.0": "^0.2.19",
|
144
144
|
"lodash": "^4.17.21",
|
145
145
|
"minimatch": "^5.1.0",
|
@@ -162,74 +162,74 @@
|
|
162
162
|
"xstate": "^5.19.2",
|
163
163
|
"yargs": "^17.0.0",
|
164
164
|
"zod": "^3.22.4",
|
165
|
-
"@ledgerhq/coin-algorand": "^0.9.
|
166
|
-
"@ledgerhq/coin-aptos": "^2.
|
167
|
-
"@ledgerhq/coin-bitcoin": "^0.16.0",
|
168
|
-
"@ledgerhq/coin-cardano": "^0.8.
|
169
|
-
"@ledgerhq/coin-casper": "^2.0.0",
|
170
|
-
"@ledgerhq/coin-celo": "^1.1.
|
171
|
-
"@ledgerhq/coin-
|
172
|
-
"@ledgerhq/coin-
|
173
|
-
"@ledgerhq/coin-filecoin": "^1.9.
|
174
|
-
"@ledgerhq/coin-framework": "^5.
|
175
|
-
"@ledgerhq/coin-hedera": "^1.7.
|
176
|
-
"@ledgerhq/coin-icon": "^0.10.
|
177
|
-
"@ledgerhq/coin-internet_computer": "^1.7.
|
178
|
-
"@ledgerhq/coin-mina": "^1.1.
|
179
|
-
"@ledgerhq/coin-multiversx": "^0.4.
|
180
|
-
"@ledgerhq/coin-
|
181
|
-
"@ledgerhq/coin-
|
182
|
-
"@ledgerhq/coin-solana": "^0.
|
183
|
-
"@ledgerhq/coin-stacks": "^0.8.
|
184
|
-
"@ledgerhq/coin-stellar": "^5.2.0",
|
185
|
-
"@ledgerhq/coin-sui": "^0.5.0",
|
186
|
-
"@ledgerhq/coin-tezos": "^5.3.0",
|
187
|
-
"@ledgerhq/coin-ton": "^0.12.
|
188
|
-
"@ledgerhq/coin-tron": "^4.
|
189
|
-
"@ledgerhq/coin-vechain": "^2.7.
|
190
|
-
"@ledgerhq/coin-xrp": "^6.2.0",
|
191
|
-
"@ledgerhq/crypto-icons-ui": "^1.
|
192
|
-
"@ledgerhq/cryptoassets": "^13.
|
193
|
-
"@ledgerhq/device-core": "^0.4.
|
194
|
-
"@ledgerhq/devices": "8.4.
|
195
|
-
"@ledgerhq/
|
196
|
-
"@ledgerhq/hw-app-
|
197
|
-
"@ledgerhq/
|
198
|
-
"@ledgerhq/hw-app-btc": "^10.9.
|
199
|
-
"@ledgerhq/hw-app-celo": "^6.33.
|
200
|
-
"@ledgerhq/hw-app-cosmos": "^6.32.
|
201
|
-
"@ledgerhq/hw-app-
|
202
|
-
"@ledgerhq/hw-app-
|
203
|
-
"@ledgerhq/hw-app-hedera": "^1.2.
|
204
|
-
"@ledgerhq/hw-app-icon": "^1.3.
|
205
|
-
"@ledgerhq/hw-app-multiversx": "^6.24.
|
206
|
-
"@ledgerhq/hw-app-near": "^6.31.
|
207
|
-
"@ledgerhq/hw-app-
|
165
|
+
"@ledgerhq/coin-algorand": "^0.9.10-next.0",
|
166
|
+
"@ledgerhq/coin-aptos": "^2.3.0-next.0",
|
167
|
+
"@ledgerhq/coin-bitcoin": "^0.16.1-next.0",
|
168
|
+
"@ledgerhq/coin-cardano": "^0.8.10-next.0",
|
169
|
+
"@ledgerhq/coin-casper": "^2.0.1-next.0",
|
170
|
+
"@ledgerhq/coin-celo": "^1.1.8-next.0",
|
171
|
+
"@ledgerhq/coin-cosmos": "^0.15.2-next.0",
|
172
|
+
"@ledgerhq/coin-evm": "^2.22.4-next.0",
|
173
|
+
"@ledgerhq/coin-filecoin": "^1.9.10-next.0",
|
174
|
+
"@ledgerhq/coin-framework": "^5.4.0-next.0",
|
175
|
+
"@ledgerhq/coin-hedera": "^1.7.2-next.0",
|
176
|
+
"@ledgerhq/coin-icon": "^0.10.10-next.0",
|
177
|
+
"@ledgerhq/coin-internet_computer": "^1.7.10-next.0",
|
178
|
+
"@ledgerhq/coin-mina": "^1.1.9-next.0",
|
179
|
+
"@ledgerhq/coin-multiversx": "^0.4.10-next.0",
|
180
|
+
"@ledgerhq/coin-near": "^0.11.10-next.0",
|
181
|
+
"@ledgerhq/coin-polkadot": "^6.2.1-next.0",
|
182
|
+
"@ledgerhq/coin-solana": "^0.26.0-next.0",
|
183
|
+
"@ledgerhq/coin-stacks": "^0.8.10-next.0",
|
184
|
+
"@ledgerhq/coin-stellar": "^5.2.1-next.0",
|
185
|
+
"@ledgerhq/coin-sui": "^0.5.1-next.0",
|
186
|
+
"@ledgerhq/coin-tezos": "^5.3.1-next.0",
|
187
|
+
"@ledgerhq/coin-ton": "^0.12.2-next.0",
|
188
|
+
"@ledgerhq/coin-tron": "^4.3.0-next.0",
|
189
|
+
"@ledgerhq/coin-vechain": "^2.7.10-next.0",
|
190
|
+
"@ledgerhq/coin-xrp": "^6.2.1-next.0",
|
191
|
+
"@ledgerhq/crypto-icons-ui": "^1.15.0-next.0",
|
192
|
+
"@ledgerhq/cryptoassets": "^13.19.0-next.0",
|
193
|
+
"@ledgerhq/device-core": "^0.4.28-next.0",
|
194
|
+
"@ledgerhq/devices": "8.4.7-next.0",
|
195
|
+
"@ledgerhq/errors": "^6.22.0-next.0",
|
196
|
+
"@ledgerhq/hw-app-algorand": "^6.31.3-next.0",
|
197
|
+
"@ledgerhq/hw-app-aptos": "^6.34.3-next.0",
|
198
|
+
"@ledgerhq/hw-app-btc": "^10.9.3-next.0",
|
199
|
+
"@ledgerhq/hw-app-celo": "^6.33.6-next.0",
|
200
|
+
"@ledgerhq/hw-app-cosmos": "^6.32.3-next.0",
|
201
|
+
"@ledgerhq/hw-app-eth": "^6.45.8-next.0",
|
202
|
+
"@ledgerhq/hw-app-exchange": "^0.10.3-next.0",
|
203
|
+
"@ledgerhq/hw-app-hedera": "^1.2.3-next.0",
|
204
|
+
"@ledgerhq/hw-app-icon": "^1.3.3-next.0",
|
205
|
+
"@ledgerhq/hw-app-multiversx": "^6.24.3-next.0",
|
206
|
+
"@ledgerhq/hw-app-near": "^6.31.3-next.0",
|
207
|
+
"@ledgerhq/hw-app-polkadot": "^6.34.3-next.0",
|
208
208
|
"@ledgerhq/hw-app-sui": "^1.1.0",
|
209
|
-
"@ledgerhq/hw-app-
|
210
|
-
"@ledgerhq/hw-app-
|
211
|
-
"@ledgerhq/hw-app-
|
212
|
-
"@ledgerhq/hw-app-
|
213
|
-
"@ledgerhq/hw-
|
214
|
-
"@ledgerhq/hw-transport": "^6.
|
215
|
-
"@ledgerhq/ledger-cal-service": "^0.
|
216
|
-
"@ledgerhq/hw-transport-mocker": "^6.29.6",
|
209
|
+
"@ledgerhq/hw-app-tezos": "^6.31.3-next.0",
|
210
|
+
"@ledgerhq/hw-app-trx": "^6.31.3-next.0",
|
211
|
+
"@ledgerhq/hw-app-vet": "^0.5.7-next.0",
|
212
|
+
"@ledgerhq/hw-app-xrp": "^6.32.1-next.0",
|
213
|
+
"@ledgerhq/hw-transport": "^6.31.7-next.0",
|
214
|
+
"@ledgerhq/hw-transport-mocker": "^6.29.7-next.0",
|
215
|
+
"@ledgerhq/ledger-cal-service": "^1.0.0-next.0",
|
217
216
|
"@ledgerhq/live-config": "^3.1.0",
|
218
|
-
"@ledgerhq/live-countervalues": "^0.5.
|
219
|
-
"@ledgerhq/live-dmk-shared": "^0.9.0",
|
220
|
-
"@ledgerhq/live-countervalues-react": "^0.2.
|
217
|
+
"@ledgerhq/live-countervalues": "^0.5.10-next.0",
|
218
|
+
"@ledgerhq/live-dmk-shared": "^0.9.1-next.0",
|
219
|
+
"@ledgerhq/live-countervalues-react": "^0.2.39-next.0",
|
221
220
|
"@ledgerhq/live-env": "^2.10.0",
|
222
221
|
"@ledgerhq/live-hooks": "0.1.0",
|
223
|
-
"@ledgerhq/live-network": "^2.0.
|
224
|
-
"@ledgerhq/live-nft": "^0.8.
|
222
|
+
"@ledgerhq/live-network": "^2.0.11-next.0",
|
223
|
+
"@ledgerhq/live-nft": "^0.8.10-next.0",
|
225
224
|
"@ledgerhq/live-promise": "^0.1.1",
|
226
|
-
"@ledgerhq/live-signer-evm": "^0.5.
|
227
|
-
"@ledgerhq/live-signer-solana": "^0.
|
228
|
-
"@ledgerhq/live-wallet": "^0.11.0",
|
225
|
+
"@ledgerhq/live-signer-evm": "^0.5.3-next.0",
|
226
|
+
"@ledgerhq/live-signer-solana": "^0.3.0-next.0",
|
227
|
+
"@ledgerhq/live-wallet": "^0.11.1-next.0",
|
229
228
|
"@ledgerhq/logs": "^6.13.0",
|
230
|
-
"@ledgerhq/speculos-transport": "^0.2.
|
229
|
+
"@ledgerhq/speculos-transport": "^0.2.4-next.0",
|
231
230
|
"@ledgerhq/wallet-api-acre-module": "^0.5.0",
|
232
|
-
"@ledgerhq/wallet-api-exchange-module": "^0.13.0"
|
231
|
+
"@ledgerhq/wallet-api-exchange-module": "^0.13.0",
|
232
|
+
"@ledgerhq/hw-app-str": "^7.2.3-next.0"
|
233
233
|
},
|
234
234
|
"devDependencies": {
|
235
235
|
"@solana/web3.js": "1.95.4",
|
@@ -239,7 +239,7 @@
|
|
239
239
|
"@tanstack/react-query": "^5.28.9",
|
240
240
|
"@testing-library/react": "^14.1.2",
|
241
241
|
"@types/bs58": "^4.0.1",
|
242
|
-
"@types/cbor": "
|
242
|
+
"@types/cbor": "6.0.0",
|
243
243
|
"@types/invariant": "^2.2.36",
|
244
244
|
"@types/jest": "^29.5.10",
|
245
245
|
"@types/lodash": "^4.14.179",
|
@@ -265,8 +265,8 @@
|
|
265
265
|
"nock": "^13.0.5",
|
266
266
|
"react": "18.3.1",
|
267
267
|
"react-dom": "18.3.1",
|
268
|
-
"react-native": "0.
|
269
|
-
"react-native-svg": "
|
268
|
+
"react-native": "0.77.2",
|
269
|
+
"react-native-svg": "15.11.2",
|
270
270
|
"react-redux": "^7.2.9",
|
271
271
|
"react-test-renderer": "^18.2.0",
|
272
272
|
"redux-actions": "2.6.5",
|
@@ -277,10 +277,10 @@
|
|
277
277
|
"undici": "6.19.2",
|
278
278
|
"uuid": "^8.3.2",
|
279
279
|
"ws": "7",
|
280
|
+
"@ledgerhq/device-react": "^0.2.34-next.0",
|
280
281
|
"@ledgerhq/types-cryptoassets": "^7.23.0",
|
281
282
|
"@ledgerhq/types-devices": "^6.25.3",
|
282
|
-
"@ledgerhq/types-live": "^6.
|
283
|
-
"@ledgerhq/device-react": "^0.2.33"
|
283
|
+
"@ledgerhq/types-live": "^6.74.0-next.0"
|
284
284
|
},
|
285
285
|
"scripts": {
|
286
286
|
"build": "zx ./scripts/build-ts.mjs",
|
package/src/e2e/speculos.ts
CHANGED
@@ -569,6 +569,9 @@ export async function expectValidAddressDevice(account: Account, addressDisplaye
|
|
569
569
|
case Currency.ATOM:
|
570
570
|
deviceLabels = [DeviceLabels.ADDRESS, DeviceLabels.CAPS_APPROVE, DeviceLabels.CAPS_REJECT];
|
571
571
|
break;
|
572
|
+
case Currency.BTC:
|
573
|
+
deviceLabels = [DeviceLabels.ADDRESS, DeviceLabels.CONFIRM, DeviceLabels.CANCEL];
|
574
|
+
break;
|
572
575
|
default:
|
573
576
|
deviceLabels = [DeviceLabels.ADDRESS, DeviceLabels.APPROVE, DeviceLabels.REJECT];
|
574
577
|
break;
|
package/src/e2e/speculosCI.ts
CHANGED
@@ -58,7 +58,7 @@ async function githubApiRequest<T = unknown>({
|
|
58
58
|
}
|
59
59
|
}
|
60
60
|
|
61
|
-
function waitForSpeculosReady(url: string, { interval = 2000, timeout =
|
61
|
+
function waitForSpeculosReady(url: string, { interval = 2000, timeout = 300_000 } = {}) {
|
62
62
|
return new Promise((resolve, reject) => {
|
63
63
|
const startTime = Date.now();
|
64
64
|
|