Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/mobile-swap-status-parity.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ledgerhq/live-common": minor
---

Extract shared swap transaction status logic for LIVE-29443 while preserving the existing transaction status import paths.
16 changes: 4 additions & 12 deletions libs/ledger-live-common/.unimportedrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
"src/exchange/swap/updateAccountSwapStatus.ts",
"src/exchange/swap/utils/index.ts",
"src/exchange/swap/webApp/index.ts",
"src/exchange/swapTransactionStatus/index.ts",
"src/exchange/swapTransactionStatus/transactionStatus.ts",
"src/explorer.ts",
"src/explorers.ts",
"src/families/algorand/logic.ts",
Expand Down Expand Up @@ -364,12 +366,7 @@
"src/domain/computeEarnUiVersion.ts",
"src/domain/earnUiVersion.ts"
],
"extensions": [
".ts",
".js",
".jsx",
".tsx"
],
"extensions": [".ts", ".js", ".jsx", ".tsx"],
"ignorePatterns": [
"**/node_modules/**",
"**/__tests__/**",
Expand Down Expand Up @@ -916,12 +913,7 @@
"@react-native/virtualized-lists",
"@solana/buffer-layout",
"@solana/codecs-numbers",
[
"@solana/codecs-numbers",
[
"node_modules/@solana/web3.js/lib/index.cjs.js"
]
],
["@solana/codecs-numbers", ["node_modules/@solana/web3.js/lib/index.cjs.js"]],
"abort-controller/dist/abort-controller",
"anser",
"base64-js",
Expand Down
20 changes: 20 additions & 0 deletions libs/ledger-live-common/jest.polyfills.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,26 @@ Object.defineProperties(global, {
clearInterval: { value: timer => clearInterval(unwrapTimer(timer)) },
});

// React DOM's scheduler otherwise opens a MessagePort in jsdom-focused tests.
Object.defineProperties(global, {
setImmediate: {
value:
typeof global.setImmediate === "function"
? global.setImmediate
: (callback, ...args) => global.setTimeout(() => callback(...args), 0),
writable: true,
configurable: true,
},
clearImmediate: {
value:
typeof global.clearImmediate === "function"
? global.clearImmediate
: timer => global.clearTimeout(timer),
writable: true,
configurable: true,
},
});

// Polyfill for 'self' (needed for tronweb in Node.js environment)
if (typeof global.self === "undefined") {
global.self = global;
Expand Down
88 changes: 88 additions & 0 deletions libs/ledger-live-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,39 @@
"*.json": [
"*.json"
],
"exchange/transactionStatus": [
"lib-es/exchange/swapTransactionStatus/transactionStatus"
],
"exchange/transactionStatus/index": [
"lib-es/exchange/swapTransactionStatus/transactionStatus"
],
Comment thread
philipptpunkt marked this conversation as resolved.
"exchange/transactionStatus/fetchSwapStatus": [
"lib-es/exchange/swapTransactionStatus/api/fetchSwapStatus"
],
"exchange/transactionStatus/fromSwapOperation": [
"lib-es/exchange/swapTransactionStatus/history/fromSwapOperation"
],
"exchange/transactionStatus/parseParams": [
"lib-es/exchange/swapTransactionStatus/params/parseParams"
],
"exchange/transactionStatus/statusController": [
"lib-es/exchange/swapTransactionStatus/status/statusController"
],
"exchange/transactionStatus/statusValues": [
"lib-es/exchange/swapTransactionStatus/status/statusValues"
],
"exchange/transactionStatus/types": [
"lib-es/exchange/swapTransactionStatus/types"
],
"exchange/swapTransactionStatus": [
"lib-es/exchange/swapTransactionStatus/index"
],
"exchange/swapTransactionStatus/index": [
"lib-es/exchange/swapTransactionStatus/index"
],
"exchange/swapTransactionStatus/transactionStatus": [
"lib-es/exchange/swapTransactionStatus/transactionStatus"
],
"*": [
"lib-es/*"
],
Expand Down Expand Up @@ -47,6 +80,61 @@
],
"default": "./lib-es/*.js"
},
"./exchange/transactionStatus": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/transactionStatus.ts",
"types": "./lib-es/exchange/swapTransactionStatus/transactionStatus.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/transactionStatus.js"
},
Comment thread
philipptpunkt marked this conversation as resolved.
"./exchange/transactionStatus/index": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/transactionStatus.ts",
"types": "./lib-es/exchange/swapTransactionStatus/transactionStatus.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/transactionStatus.js"
},
"./exchange/transactionStatus/fetchSwapStatus": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/api/fetchSwapStatus.ts",
"types": "./lib-es/exchange/swapTransactionStatus/api/fetchSwapStatus.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/api/fetchSwapStatus.js"
},
"./exchange/transactionStatus/fromSwapOperation": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/history/fromSwapOperation.ts",
"types": "./lib-es/exchange/swapTransactionStatus/history/fromSwapOperation.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/history/fromSwapOperation.js"
},
"./exchange/transactionStatus/parseParams": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/params/parseParams.ts",
"types": "./lib-es/exchange/swapTransactionStatus/params/parseParams.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/params/parseParams.js"
},
"./exchange/transactionStatus/statusController": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/status/statusController.ts",
"types": "./lib-es/exchange/swapTransactionStatus/status/statusController.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/status/statusController.js"
},
"./exchange/transactionStatus/statusValues": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/status/statusValues.ts",
"types": "./lib-es/exchange/swapTransactionStatus/status/statusValues.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/status/statusValues.js"
},
"./exchange/transactionStatus/types": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/types.ts",
"types": "./lib-es/exchange/swapTransactionStatus/types.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/types.js"
},
"./exchange/swapTransactionStatus": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/index.ts",
"types": "./lib-es/exchange/swapTransactionStatus/index.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/index.js"
},
"./exchange/swapTransactionStatus/index": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/index.ts",
"types": "./lib-es/exchange/swapTransactionStatus/index.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/index.js"
},
"./exchange/swapTransactionStatus/transactionStatus": {
"@ledgerhq/source": "./src/exchange/swapTransactionStatus/transactionStatus.ts",
"types": "./lib-es/exchange/swapTransactionStatus/transactionStatus.d.ts",
"default": "./lib-es/exchange/swapTransactionStatus/transactionStatus.js"
},
".": {
"default": "./lib-es/index.js"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getMultipleStatus } from "../swap/getStatus";
import { getMultipleStatus } from "../../swap/getStatus";
import { fetchTransactionSwapStatus } from "./fetchSwapStatus";

jest.mock("../swap/getStatus", () => ({
jest.mock("../../swap/getStatus", () => ({
getMultipleStatus: jest.fn(),
}));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getMultipleStatus } from "../swap/getStatus";
import type { SwapStatus, SwapStatusRequest } from "../swap/types";
import { getMultipleStatus } from "../../swap/getStatus";
import type { SwapStatus, SwapStatusRequest } from "../../swap/types";

export async function fetchTransactionSwapStatus(
request: SwapStatusRequest,
Expand Down
Loading
Loading