Update all to useUSer composabe. Still some bugs to resolve.

This commit is contained in:
Filipe Soccol
2025-04-01 12:04:24 -03:00
parent e93cac6086
commit 9fa2b34a5d
26 changed files with 495 additions and 454 deletions

View File

@@ -3,9 +3,8 @@ import SearchComponent from "@/components/SearchComponent.vue";
import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
import BuyConfirmedComponent from "@/components/BuyConfirmedComponent/BuyConfirmedComponent.vue";
import { ref, onMounted, watch } from "vue";
import { useViemStore } from "@/store/viem";
import { useUser } from "@/composables/useUser";
import QrCodeComponent from "@/components/QrCodeComponent.vue";
import { storeToRefs } from "pinia";
import { addLock, releaseLock } from "@/blockchain/buyerMethods";
import { updateWalletStatus, checkUnreleasedLock } from "@/blockchain/wallet";
import { getNetworksLiquidity } from "@/blockchain/events";
@@ -20,11 +19,11 @@ enum Step {
List,
}
const viemStore = useViemStore();
viemStore.setSellerView(false);
const user = useUser();
user.setSellerView(false);
// States
const { loadingLock, walletAddress, networkName } = storeToRefs(viemStore);
const { loadingLock, walletAddress, networkName } = user;
const flowStep = ref<Step>(Step.Search);
const pixTarget = ref<string>();
const tokenAmount = ref<number>();
@@ -34,18 +33,13 @@ const showModal = ref<boolean>(false);
const showBuyAlert = ref<boolean>(false);
const paramLockID = window.history.state?.lockID;
const confirmBuyClick = async (
selectedDeposit: ValidDeposit,
tokenValue: number
) => {
// finish buy screen
const confirmBuyClick = async (selectedDeposit: ValidDeposit, tokenValue: number) => {
pixTarget.value = selectedDeposit.pixKey;
tokenAmount.value = tokenValue;
// Makes lock with deposit ID and the Amount
if (selectedDeposit) {
flowStep.value = Step.Buy;
viemStore.setLoadingLock(true);
user.setLoadingLock(true);
await addLock(selectedDeposit.seller, selectedDeposit.token, tokenValue)
.then((_lockID) => {
@@ -56,7 +50,7 @@ const confirmBuyClick = async (
flowStep.value = Step.Search;
});
viemStore.setLoadingLock(false);
user.setLoadingLock(false);
}
};

View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref, onMounted, watch } from "vue";
import { useViemStore } from "@/store/viem";
import { useUser } from "@/composables/useUser";
import ListingComponent from "@/components/ListingComponent/ListingComponent.vue";
import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
import CustomAlert from "@/components/CustomAlert/CustomAlert.vue";
@@ -14,10 +14,9 @@ import type { ValidDeposit } from "@/model/ValidDeposit";
import type { WalletTransaction } from "@/model/WalletTransaction";
import router from "@/router/index";
import { storeToRefs } from "pinia";
const viemStore = useViemStore();
const { walletAddress, networkName, selectedToken } = storeToRefs(viemStore);
const user = useUser();
const { walletAddress, networkName, selectedToken } = user;
const loadingWithdraw = ref<boolean>(false);
const showAlert = ref<boolean>(false);
@@ -47,7 +46,7 @@ const callWithdraw = async (amount: string) => {
};
const getWalletTransactions = async () => {
viemStore.setLoadingWalletTransactions(true);
user.setLoadingWalletTransactions(true);
if (walletAddress.value) {
console.log("Will fetch all required data...");
const walletDeposits = await listValidDepositTransactionsByWalletAddress(
@@ -70,7 +69,7 @@ const getWalletTransactions = async () => {
transactionsList.value = allUserTransactions;
}
}
viemStore.setLoadingWalletTransactions(false);
user.setLoadingWalletTransactions(false);
};
onMounted(async () => {

View File

@@ -1,13 +1,12 @@
<script setup lang="ts">
import { ref, onMounted, watch } from "vue";
import { storeToRefs } from "pinia";
import SellerComponent from "@/components/SellerSteps/SellerComponent.vue";
import SearchComponent from "@/components/SearchComponent.vue";
import SendNetwork from "@/components/SellerSteps/SendNetwork.vue";
import SellerSearchComponent from "@/components/SellerSteps/SellerSearchComponent.vue";
import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
import { useViemStore } from "@/store/viem";
import { useUser } from "@/composables/useUser";
import { approveTokens, addDeposit } from "@/blockchain/sellerMethods";
import CustomAlert from "@/components/CustomAlert/CustomAlert.vue";
@@ -19,12 +18,11 @@ enum Step {
Network,
}
const viemStore = useViemStore();
viemStore.setSellerView(true);
const user = useUser();
user.setSellerView(true);
const flowStep = ref<Step>(Step.Sell);
const loading = ref<boolean>(false);
const showAlert = ref<boolean>(false);
// Verificar tipagem
@@ -44,7 +42,7 @@ const approveOffer = async (args: Participant) => {
const sendNetwork = async () => {
loading.value = true;
try {
if (viemStore.seller) {
if (user.seller.value) {
await addDeposit();
flowStep.value = Step.Sell;
loading.value = false;
@@ -74,9 +72,9 @@ const sendNetwork = async () => {
/>
<div v-if="flowStep == Step.Network">
<SendNetwork
:sellerId="viemStore.sellerId"
:offer="Number(viemStore.seller.offer)"
:selected-token="viemStore.selectedToken"
:sellerId="user.sellerId"
:offer="Number(user.seller.offer)"
:selected-token="user.selectedToken"
v-if="!loading"
@send-network="sendNetwork"
/>