diff --git a/src/blockchain/__tests__/addresses.spec.ts b/src/blockchain/__tests__/addresses.spec.ts index 2520492..450417d 100644 --- a/src/blockchain/__tests__/addresses.spec.ts +++ b/src/blockchain/__tests__/addresses.spec.ts @@ -87,12 +87,12 @@ describe("addresses.ts functions", () => { it("isPossibleNetwork Returns", () => { const etherStore = useEtherStore(); etherStore.setNetworkId(NetworkEnum.sepolia); - expect(isPossibleNetwork(0x5)).toBe(true); - expect(isPossibleNetwork(5)).toBe(true); - expect(isPossibleNetwork(0x13881)).toBe(true); - expect(isPossibleNetwork(80001)).toBe(true); + expect(isPossibleNetwork(0x5 as NetworkEnum)).toBe(true); + expect(isPossibleNetwork(5 as NetworkEnum)).toBe(true); + expect(isPossibleNetwork(0x13881 as NetworkEnum)).toBe(true); + expect(isPossibleNetwork(80001 as NetworkEnum)).toBe(true); - expect(isPossibleNetwork(NaN)).toBe(false); - expect(isPossibleNetwork(0x55)).toBe(false); + expect(isPossibleNetwork(NaN as NetworkEnum)).toBe(false); + expect(isPossibleNetwork(0x55 as NetworkEnum)).toBe(false); }); }); diff --git a/src/blockchain/wallet.ts b/src/blockchain/wallet.ts index bfbf5f7..5761240 100644 --- a/src/blockchain/wallet.ts +++ b/src/blockchain/wallet.ts @@ -26,8 +26,8 @@ export const updateWalletStatus = async (): Promise => { const provider = await getProvider(); const signer = await provider?.getSigner(); - - const { chainId } = await provider?.getNetwork(); + const network = await provider?.getNetwork(); + const chainId = network?.chainId; if (!isPossibleNetwork(Number(chainId))) { window.alert("Invalid chain!:" + chainId); return; diff --git a/src/model/Bank.ts b/src/model/Bank.ts index 25f0684..960fcb0 100644 --- a/src/model/Bank.ts +++ b/src/model/Bank.ts @@ -1,5 +1,5 @@ export interface Bank { - COMPE: string; - ISPB: string; - longName: string; + COMPE: string; + ISPB: string; + longName: string; } diff --git a/src/model/mock/EventMock.ts b/src/model/mock/EventMock.ts index ed03598..1995a9f 100644 --- a/src/model/mock/EventMock.ts +++ b/src/model/mock/EventMock.ts @@ -1,7 +1,6 @@ -import type { Event } from "ethers"; import { vi } from "vitest"; -export const MockEvents: Event[] = [ +export const MockEvents = [ { blockNumber: 1, blockHash: "0x8", diff --git a/src/model/mock/ValidDepositMock.ts b/src/model/mock/ValidDepositMock.ts index c767473..21a308a 100644 --- a/src/model/mock/ValidDepositMock.ts +++ b/src/model/mock/ValidDepositMock.ts @@ -1,4 +1,5 @@ import type { ValidDeposit } from "../ValidDeposit"; +import { NetworkEnum } from "@/model/NetworkEnum"; export const MockValidDeposits: ValidDeposit[] = [ { @@ -7,6 +8,7 @@ export const MockValidDeposits: ValidDeposit[] = [ remaining: 70, seller: "mockedSellerAddress", pixKey: "123456789", + network: NetworkEnum.sepolia, }, { blockNumber: 2, @@ -14,6 +16,7 @@ export const MockValidDeposits: ValidDeposit[] = [ remaining: 200, seller: "mockedSellerAddress", pixKey: "123456789", + network: NetworkEnum.sepolia, }, { blockNumber: 3, @@ -21,6 +24,7 @@ export const MockValidDeposits: ValidDeposit[] = [ remaining: 1250, seller: "mockedSellerAddress", pixKey: "123456789", + network: NetworkEnum.sepolia, }, { blockNumber: 4, @@ -28,6 +32,7 @@ export const MockValidDeposits: ValidDeposit[] = [ remaining: 4000, seller: "mockedSellerAddress", pixKey: "123456789", + network: NetworkEnum.sepolia, }, { blockNumber: 5, @@ -35,5 +40,6 @@ export const MockValidDeposits: ValidDeposit[] = [ remaining: 2000, seller: "mockedSellerAddress", pixKey: "123456789", + network: NetworkEnum.sepolia, }, ]; diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b87c962..fea71b9 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -12,6 +12,7 @@ import { getNetworksLiquidity } from "@/blockchain/events"; import type { ValidDeposit } from "@/model/ValidDeposit"; import { getUnreleasedLockById } from "@/blockchain/events"; import CustomAlert from "@/components/CustomAlert/CustomAlert.vue"; +import { getSolicitation } from "@/utils/bbPay"; enum Step { Search, @@ -66,7 +67,7 @@ const releaseTransaction = async (lockId: string) => { const solicitation = await getSolicitation(lockId); - if (solicitation.confirmed) { + if (solicitation.status) { const release = await releaseLock(solicitation); await release.wait();