Merge branch 'main' into tbtc-api-retries

thesis · Dec 9, 2024 · d6150ff · d6150ff
2 parents 923caca + 1e48147
commit d6150ff
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/dapp/src/tests/factories.ts b/dapp/src/tests/factories.ts
diff --git a/dapp/src/sentry.test.ts → dapp/test/sentry.test.ts b/dapp/src/sentry.test.ts → dapp/test/sentry.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest"
 import * as Sentry from "@sentry/react"
-import sentry from "./sentry"
+import sentry from "#/sentry"
 
 describe("sentry", () => {
   describe("setUser", () => {

diff --git a/dapp/src/store/tests/walletSlice.test.ts → dapp/test/store/walletSlice.test.ts b/dapp/src/store/tests/walletSlice.test.ts → dapp/test/store/walletSlice.test.ts
@@ -1,8 +1,21 @@
 import { beforeEach, describe, expect, it } from "vitest"
-import { createActivity } from "#/tests/factories"
 import { Activity } from "#/types"
-import { WalletState } from "../wallet"
-import reducer, { initialState, setActivities } from "../wallet/walletSlice"
+import reducer, {
+  WalletState,
+  initialState,
+  setActivities,
+} from "#/store/wallet/walletSlice"
+import { dateToUnixTimestamp, randomInteger } from "#/utils"
+
+const createActivity = (overrides: Partial<Activity> = {}): Activity => ({
+  id: crypto.randomUUID(),
+  initializedAt: dateToUnixTimestamp() - randomInteger(0, 1000000),
+  amount: BigInt(randomInteger(1000000, 1000000000)),
+  txHash: "c9625ecc138bbd241439f158f65f43e152968ff35e203dec89cfb78237d6a2d8",
+  status: "completed",
+  type: "deposit",
+  ...overrides,
+})
 
 const isSignedMessage = false
 const hasFetchedActivities = true

diff --git a/dapp/src/utils/tests/activities.test.ts → dapp/test/utils/activities.test.ts b/dapp/src/utils/tests/activities.test.ts → dapp/test/utils/activities.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest"
-import { getEstimatedDuration } from "../activities"
+import { getEstimatedDuration } from "#/utils/activities"
 
 describe("Utils functions for activities", () => {
   describe("getEstimatedDuration", () => {

diff --git a/dapp/src/utils/tests/numbers.test.ts → dapp/test/utils/numbers.test.ts b/dapp/src/utils/tests/numbers.test.ts → dapp/test/utils/numbers.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest"
-import { roundUp } from "../numbers"
+import { roundUp } from "#/utils/numbers"
 
 describe("Utils functions for numbers", () => {
   describe("roundUp", () => {

diff --git a/...edger-live/tests/bitcoin-provider.test.ts → ...ekit/ledger-live/bitcoin-provider.test.ts b/...edger-live/tests/bitcoin-provider.test.ts → ...ekit/ledger-live/bitcoin-provider.test.ts
@@ -8,7 +8,7 @@ import { Balance } from "@orangekit/react/dist/src/wallet/bitcoin-wallet-provide
 import { AcreMessageType } from "@ledgerhq/wallet-api-acre-module"
 import { ZeroAddress } from "ethers"
 import BigNumber from "bignumber.js"
-import AcreLedgerLiveBitcoinProvider from "../bitcoin-provider"
+import AcreLedgerLiveBitcoinProvider from "#/utils/orangekit/ledger-live/bitcoin-provider"
 
 describe("AcreLedgerLiveBitcoinProvider", () => {
   const bitcoinAddress = "mjc2zGWypwpNyDi4ZxGbBNnUA84bfgiwYc"