@ledgerhq/live-common 31.0.0-next.1 → 31.0.0-next.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.
- package/lib/hw/actions/initSwap.d.ts.map +1 -1
- package/lib/hw/actions/initSwap.js +15 -12
- package/lib/hw/actions/initSwap.js.map +1 -1
- package/lib-es/hw/actions/initSwap.d.ts.map +1 -1
- package/lib-es/hw/actions/initSwap.js +16 -13
- package/lib-es/hw/actions/initSwap.js.map +1 -1
- package/package.json +1 -1
- package/src/hw/actions/initSwap.ts +10 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSwap.d.ts","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"initSwap.d.ts","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,UAAU,EAAM,MAAM,MAAM,CAAC;AAG9C,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,eAAe,EAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,KAAK,EAAc,QAAQ,EAAE,MAAM,OAAO,CAAC;AAElD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,KAAK,KAAK,GAAG;IACX,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,aAAa,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEtC,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,eAAe,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACrD,CAAC;AAEF,KAAK,MAAM,GACP;IACE,cAAc,EAAE,cAAc,CAAC;CAChC,GACD;IACE,aAAa,EAAE,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEN,KAAK,cAAc,GAAG,MAAM,CAAC,eAAe,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;AAuErE,eAAO,MAAM,YAAY,0BACA,eAAe,KAAK,WAAW,eAAe,CAAC,uBACjD,aAAa,KAAK,WAAW,gBAAgB,CAAC,KAClE,cA0FF,CAAC"}
|
|
@@ -56,18 +56,21 @@ const createAction = (connectAppExec, initSwapExec) => {
|
|
|
56
56
|
const { fromAccount, fromParentAccount, toAccount, toParentAccount } = exchange;
|
|
57
57
|
const mainFromAccount = (0, account_1.getMainAccount)(fromAccount, fromParentAccount);
|
|
58
58
|
const maintoAccount = (0, account_1.getMainAccount)(toAccount, toParentAccount);
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
59
|
+
const request = (0, react_1.useMemo)(() => {
|
|
60
|
+
return {
|
|
61
|
+
appName: "Exchange",
|
|
62
|
+
dependencies: [
|
|
63
|
+
{
|
|
64
|
+
account: mainFromAccount,
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
account: maintoAccount,
|
|
68
|
+
},
|
|
69
|
+
],
|
|
70
|
+
requireLatestFirmware,
|
|
71
|
+
};
|
|
72
|
+
}, [mainFromAccount, maintoAccount, requireLatestFirmware]);
|
|
73
|
+
const appState = (0, app_1.createAction)(connectAppExec).useHook(reduxDeviceFrozen, request);
|
|
71
74
|
const { device, opened, error } = appState;
|
|
72
75
|
const hasError = error || state.error;
|
|
73
76
|
(0, react_1.useEffect)(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSwap.js","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"initSwap.js","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSwap.d.ts","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"initSwap.d.ts","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,UAAU,EAAM,MAAM,MAAM,CAAC;AAG9C,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,eAAe,EAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,KAAK,EAAc,QAAQ,EAAE,MAAM,OAAO,CAAC;AAElD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,KAAK,KAAK,GAAG;IACX,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;IAClD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,aAAa,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEtC,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,eAAe,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACrD,CAAC;AAEF,KAAK,MAAM,GACP;IACE,cAAc,EAAE,cAAc,CAAC;CAChC,GACD;IACE,aAAa,EAAE,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEN,KAAK,cAAc,GAAG,MAAM,CAAC,eAAe,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;AAuErE,eAAO,MAAM,YAAY,0BACA,eAAe,KAAK,WAAW,eAAe,CAAC,uBACjD,aAAa,KAAK,WAAW,gBAAgB,CAAC,KAClE,cA0FF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { log } from "@ledgerhq/logs";
|
|
2
|
-
import { useEffect, useState } from "react";
|
|
2
|
+
import { useEffect, useState, useMemo } from "react";
|
|
3
3
|
import { concat, of } from "rxjs";
|
|
4
4
|
import { catchError, scan, tap } from "rxjs/operators";
|
|
5
5
|
import { getMainAccount } from "../../account";
|
|
@@ -53,18 +53,21 @@ export const createAction = (connectAppExec, initSwapExec) => {
|
|
|
53
53
|
const { fromAccount, fromParentAccount, toAccount, toParentAccount } = exchange;
|
|
54
54
|
const mainFromAccount = getMainAccount(fromAccount, fromParentAccount);
|
|
55
55
|
const maintoAccount = getMainAccount(toAccount, toParentAccount);
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
56
|
+
const request = useMemo(() => {
|
|
57
|
+
return {
|
|
58
|
+
appName: "Exchange",
|
|
59
|
+
dependencies: [
|
|
60
|
+
{
|
|
61
|
+
account: mainFromAccount,
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
account: maintoAccount,
|
|
65
|
+
},
|
|
66
|
+
],
|
|
67
|
+
requireLatestFirmware,
|
|
68
|
+
};
|
|
69
|
+
}, [mainFromAccount, maintoAccount, requireLatestFirmware]);
|
|
70
|
+
const appState = createAppAction(connectAppExec).useHook(reduxDeviceFrozen, request);
|
|
68
71
|
const { device, opened, error } = appState;
|
|
69
72
|
const hasError = error || state.error;
|
|
70
73
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSwap.js","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"initSwap.js","sourceRoot":"","sources":["../../../src/hw/actions/initSwap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { log } from "@ledgerhq/logs";
|
|
2
|
-
import React, { useEffect, useState } from "react";
|
|
2
|
+
import React, { useEffect, useState, useMemo } from "react";
|
|
3
3
|
import { concat, Observable, of } from "rxjs";
|
|
4
4
|
import { catchError, scan, tap } from "rxjs/operators";
|
|
5
5
|
import { getMainAccount } from "../../account";
|
|
@@ -12,7 +12,7 @@ import type {
|
|
|
12
12
|
SwapTransaction,
|
|
13
13
|
} from "../../exchange/swap/types";
|
|
14
14
|
import type { ConnectAppEvent, Input as ConnectAppInput } from "../connectApp";
|
|
15
|
-
import type { AppState } from "./app";
|
|
15
|
+
import type { AppRequest, AppState } from "./app";
|
|
16
16
|
import { createAction as createAppAction } from "./app";
|
|
17
17
|
import type { Action, Device } from "./types";
|
|
18
18
|
import { TransactionStatus } from "../../generated/types";
|
|
@@ -145,9 +145,9 @@ export const createAction = (
|
|
|
145
145
|
exchange;
|
|
146
146
|
const mainFromAccount = getMainAccount(fromAccount, fromParentAccount);
|
|
147
147
|
const maintoAccount = getMainAccount(toAccount, toParentAccount);
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
{
|
|
148
|
+
|
|
149
|
+
const request: AppRequest = useMemo(() => {
|
|
150
|
+
return {
|
|
151
151
|
appName: "Exchange",
|
|
152
152
|
dependencies: [
|
|
153
153
|
{
|
|
@@ -158,7 +158,11 @@ export const createAction = (
|
|
|
158
158
|
},
|
|
159
159
|
],
|
|
160
160
|
requireLatestFirmware,
|
|
161
|
-
}
|
|
161
|
+
};
|
|
162
|
+
}, [mainFromAccount, maintoAccount, requireLatestFirmware]);
|
|
163
|
+
const appState = createAppAction(connectAppExec).useHook(
|
|
164
|
+
reduxDeviceFrozen,
|
|
165
|
+
request
|
|
162
166
|
);
|
|
163
167
|
const { device, opened, error } = appState;
|
|
164
168
|
const hasError = error || state.error;
|