-
+
+
+
+
+
@@ -143,11 +173,22 @@ showInitialItems(); type="number" name="" id="" + @input="debounce(handleInputEvent, 500)($event)" placeholder="0" class="text-2xl text-gray-900 w-full outline-none" v-model="withdrawAmount" />
+ Por favor utilize no máximo 2 casas decimais
+
+
+ Saldo insuficiente
+
Cancelar
+
-
+
-
-
+ Ativo
+
+
+ Expirado
+
+
Finalizado
{{ getExplorer() }}
@@ -242,6 +303,9 @@ p {
@apply flex justify-between items-center;
}
+.status-text {
+ @apply text-base font-medium text-gray-900 rounded-lg text-center mb-2 p-1;
+}
.text {
@apply text-white text-center;
}
diff --git a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
index 9d066db..114530e 100644
--- a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
+++ b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
@@ -3,11 +3,13 @@ import ListingComponent from "@/components/ListingComponent/ListingComponent.vue
import { createPinia, setActivePinia } from "pinia";
import { expect } from "vitest";
import { MockValidDeposits } from "@/model/mock/ValidDepositMock";
-import { MockEvents } from "@/model/mock/EventMock";
+import { MockWalletTransactions } from "@/model/mock/WalletTransactionMock";
+import { useEtherStore } from "@/store/ether";
describe("ListingComponent.vue", () => {
beforeEach(() => {
setActivePinia(createPinia());
+ useEtherStore().setLoadingWalletTransactions(false);
});
test("Test Message when an empty array is received", () => {
@@ -25,7 +27,7 @@ describe("ListingComponent.vue", () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: [],
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
@@ -38,7 +40,7 @@ describe("ListingComponent.vue", () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: MockValidDeposits,
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
const btn = wrapper.find("button");
@@ -50,14 +52,14 @@ describe("ListingComponent.vue", () => {
elements = wrapper.findAll(".item-container");
- expect(elements).toHaveLength(4);
+ expect(elements).toHaveLength(5);
});
test("Test withdraw offer button emit", async () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: MockValidDeposits,
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
wrapper.vm.$emit("depositWithdrawn");
diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 2dbadc1..2a1736d 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -9,6 +9,7 @@ import { verifyNetworkLiquidity } from "@/utils/networkLiquidity";
import { NetworkEnum } from "@/model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit";
import { decimalCount } from "@/utils/decimalCount";
+import SpinnerComponent from "./SpinnerComponent.vue";
// Store reference
const etherStore = useEtherStore();
@@ -18,6 +19,7 @@ const {
networkName,
depositsValidListGoerli,
depositsValidListMumbai,
+ loadingNetworkLiquidity,
} = storeToRefs(etherStore);
// Reactive state
@@ -160,8 +162,11 @@ watch(walletAddress, (): void => {
@@ -242,6 +303,9 @@ p {
@apply flex justify-between items-center;
}
+.status-text {
+ @apply text-base font-medium text-gray-900 rounded-lg text-center mb-2 p-1;
+}
.text {
@apply text-white text-center;
}
diff --git a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
index 9d066db..114530e 100644
--- a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
+++ b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
@@ -3,11 +3,13 @@ import ListingComponent from "@/components/ListingComponent/ListingComponent.vue
import { createPinia, setActivePinia } from "pinia";
import { expect } from "vitest";
import { MockValidDeposits } from "@/model/mock/ValidDepositMock";
-import { MockEvents } from "@/model/mock/EventMock";
+import { MockWalletTransactions } from "@/model/mock/WalletTransactionMock";
+import { useEtherStore } from "@/store/ether";
describe("ListingComponent.vue", () => {
beforeEach(() => {
setActivePinia(createPinia());
+ useEtherStore().setLoadingWalletTransactions(false);
});
test("Test Message when an empty array is received", () => {
@@ -25,7 +27,7 @@ describe("ListingComponent.vue", () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: [],
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
@@ -38,7 +40,7 @@ describe("ListingComponent.vue", () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: MockValidDeposits,
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
const btn = wrapper.find("button");
@@ -50,14 +52,14 @@ describe("ListingComponent.vue", () => {
elements = wrapper.findAll(".item-container");
- expect(elements).toHaveLength(4);
+ expect(elements).toHaveLength(5);
});
test("Test withdraw offer button emit", async () => {
const wrapper = mount(ListingComponent, {
props: {
validDeposits: MockValidDeposits,
- walletTransactions: MockEvents,
+ walletTransactions: MockWalletTransactions,
},
});
wrapper.vm.$emit("depositWithdrawn");
diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index 2dbadc1..2a1736d 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -9,6 +9,7 @@ import { verifyNetworkLiquidity } from "@/utils/networkLiquidity";
import { NetworkEnum } from "@/model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit";
import { decimalCount } from "@/utils/decimalCount";
+import SpinnerComponent from "./SpinnerComponent.vue";
// Store reference
const etherStore = useEtherStore();
@@ -18,6 +19,7 @@ const {
networkName,
depositsValidListGoerli,
depositsValidListMumbai,
+ loadingNetworkLiquidity,
} = storeToRefs(etherStore);
// Reactive state
@@ -160,8 +162,11 @@ watch(walletAddress, (): void => {
+
+
- ~ R$ {{ tokenValue.toFixed(2) }}
@@ -182,12 +187,31 @@ watch(walletAddress, (): void => { />
+
+ Carregando liquidez das redes.
+
+
Por favor utilize no máximo 2 casas decimais
-
+
Atualmente não há liquidez nas redes para sua demanda
diff --git a/src/components/SpinnerComponent.vue b/src/components/SpinnerComponent.vue
new file mode 100644
index 0000000..495ed1c
--- /dev/null
+++ b/src/components/SpinnerComponent.vue
@@ -0,0 +1,41 @@
+
+
+
+ 
();
const lockID = ref("");
const loadingRelease = ref(false);
const showModal = ref(false);
-const lastWalletReleaseTransactions = ref([]);
+const lastWalletTransactions = ref([]);
+const depositList = ref([]);
const confirmBuyClick = async (
selectedDeposit: ValidDeposit,
@@ -75,21 +82,50 @@ const releaseTransaction = async (e2eId: string) => {
);
release.wait();
- await listReleaseTransactionByWalletAddress(
- walletAddress.value.toLowerCase()
- ).then((releaseTransactions) => {
- if (releaseTransactions)
- lastWalletReleaseTransactions.value = releaseTransactions;
- });
+ await getWalletTransactions();
await updateWalletStatus();
loadingRelease.value = false;
}
};
+const getWalletTransactions = async () => {
+ etherStore.setLoadingWalletTransactions(true);
+ if (walletAddress.value) {
+ const walletDeposits = await listValidDepositTransactionsByWalletAddress(
+ walletAddress.value
+ );
+
+ const allUserTransactions = await listAllTransactionByWalletAddress(
+ walletAddress.value
+ );
+
+ if (walletDeposits) {
+ depositList.value = walletDeposits;
+ }
+ if (allUserTransactions) {
+ lastWalletTransactions.value = allUserTransactions;
+ }
+ }
+ etherStore.setLoadingWalletTransactions(false);
+};
+
+const callWithdraw = async (amount: string) => {
+ if (amount) {
+ etherStore.setLoadingWalletTransactions(true);
+ const withdraw = await withdrawDeposit(amount);
+ if (withdraw) {
+ console.log("Saque realizado!");
+ await getWalletTransactions();
+ } else {
+ console.log("Não foi possível realizar o saque!");
+ }
+ etherStore.setLoadingWalletTransactions(false);
+ }
+};
+
const checkForUnreleasedLocks = async (): Promise => {
const walletLocks = await checkUnreleasedLock(walletAddress.value);
- console.log(walletLocks);
if (walletLocks) {
lockID.value = walletLocks.lockID;
tokenAmount.value = walletLocks.pix.value;
@@ -142,12 +178,22 @@ onMounted(async () => {
/>
+
+
+
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 7897ce6..03b96b5 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -118,7 +118,9 @@ onClickOutside(infoMenuRef, () => {
:to="'/faq'"
class="menu-button gap-2 px-4 rounded-md cursor-pointer"
>
-
+
Perguntas frequentes
@@ -357,7 +359,7 @@ onClickOutside(infoMenuRef, () => {
{{ formatWalletAddress() }}
();
const lockID = ref
- (false);
+
const depositList = ref([]);
-const transactionsList = ref([]);
+const transactionsList = ref([]);
-const updateRemaining = async () => {
- const walletDeposits = await listValidDepositTransactionsByWalletAddress(
- walletAddress.value
- );
- depositList.value = walletDeposits;
+const callWithdraw = async (amount: string) => {
+ if (amount) {
+ loadingWithdraw.value = true;
+ let withdraw;
+ try {
+ withdraw = await withdrawDeposit(amount);
+ } catch {
+ loadingWithdraw.value = false;
+ }
- const allUserTransactions = await listAllTransactionByWalletAddress(
- walletAddress.value
- );
- transactionsList.value = allUserTransactions;
+ if (withdraw) {
+ console.log("Saque realizado!");
+ await getWalletTransactions();
+ } else {
+ console.log("Não foi possível realizar o saque!");
+ }
+ loadingWithdraw.value = false;
+ }
};
-onMounted(async () => {
+const getWalletTransactions = async () => {
+ etherStore.setLoadingWalletTransactions(true);
if (walletAddress.value) {
const walletDeposits = await listValidDepositTransactionsByWalletAddress(
walletAddress.value
@@ -45,54 +60,44 @@ onMounted(async () => {
transactionsList.value = allUserTransactions;
}
}
+ etherStore.setLoadingWalletTransactions(false);
+};
+
+onMounted(async () => {
+ if (!walletAddress.value) {
+ router.push({ name: "home" });
+ }
+ await getWalletTransactions();
});
-watch(walletAddress, async (newValue) => {
- await listValidDepositTransactionsByWalletAddress(newValue)
- .then((res) => {
- if (res) depositList.value = res;
- })
- .catch(() => {
- depositList.value = [];
- });
-
- await listAllTransactionByWalletAddress(newValue)
- .then((res) => {
- if (res) transactionsList.value = res;
- })
- .catch(() => {
- transactionsList.value = [];
- });
+watch(walletAddress, async () => {
+ await getWalletTransactions();
});
watch(networkName, async () => {
- await listValidDepositTransactionsByWalletAddress(walletAddress.value)
- .then((res) => {
- if (res) depositList.value = res;
- })
- .catch(() => {
- depositList.value = [];
- });
-
- await listAllTransactionByWalletAddress(walletAddress.value)
- .then((res) => {
- if (res) transactionsList.value = res;
- })
- .catch(() => {
- transactionsList.value = [];
- });
+ await getWalletTransactions();
});
+
+ Gerenciar transações
+
+
-
Gerenciar Ofertas
+
+ Por Favor Conecte Sua Carteira
+
+
+ Gerenciar Ofertas
+