Merge branch 'develop' into transaction-history

src/views/MockView.vue

@@ -36,7 +36,7 @@ const formatWalletAddress = (wallet: string): string => {
 // Gets value and pix key from user's form to create a deposit in the blockchain
 const mockDeposit = () => {
   if (!depositValue.value || !depositPixKey.value) return;
-  blockchain.addDeposit(depositValue.value, depositPixKey.value);
+  blockchain.mockDeposit(depositValue.value, depositPixKey.value);
 };
 
 // Get specific deposit data by its ID

src/views/SellerView.vue

@@ -2,9 +2,9 @@
 import WantSellComponent from "../components/SellerSteps/WantSellComponent.vue";
 import SendNetwork from "../components/SellerSteps/SendNetwork.vue";
 import ValidationComponent from "../components/LoadingComponent.vue";
+import blockchain from "../utils/blockchain";
 
 import { ref } from "vue";
-import router from "@/router";
 
 enum Step {
   Search,
@@ -15,41 +15,55 @@ enum Step {
 const flowStep = ref<Step>(Step.Sell);
 const loading = ref<boolean>(false);
 
-const walletConnect = async () => {
-  flowStep.value = Step.Sell;
-};
+const offerValue = ref<number>();
+const pixKeyBuyer = ref<string>("");
 
-const approveTokens = async () => {
+// Verificar tipagem
+const approveOffer = async ({ offer, pixKey }: any) => {
   loading.value = true;
-  setTimeout(() => {
-    loading.value = false;
+  try {
+    offerValue.value = offer;
+    pixKeyBuyer.value = pixKey;
+    await blockchain.approveTokens(Number(offerValue.value));
     flowStep.value = Step.Network;
-  }, 2000);
+    loading.value = false;
+  } catch {
+    flowStep.value = Step.Sell;
+    loading.value = false;
+  }
 };
 
 const sendNetwork = async () => {
   loading.value = true;
-  setTimeout(() => {
+  try {
+    if (offerValue.value && pixKeyBuyer.value) {
+      await blockchain.addDeposit(offerValue.value, pixKeyBuyer.value);
+      flowStep.value = Step.Sell;
+      loading.value = false;
+    }
+  } catch (err) {
+    console.log(err);
+    flowStep.value = Step.Network;
     loading.value = false;
-    router.push("/");
-  }, 2000);
+  }
 };
 </script>
 
 <template>
-  <!-- <SellerSearchComponent
-    v-if="flowStep == Step.Search"
-    @token-buy="walletConnect"
-  /> -->
   <div v-if="flowStep == Step.Sell">
-    <WantSellComponent v-if="!loading" @approve-tokens="approveTokens" />
+    <WantSellComponent v-if="!loading" @approve-tokens="approveOffer" />
     <ValidationComponent
       v-if="loading"
       :message="'A transação está sendo enviada para a rede.'"
     />
   </div>
   <div v-if="flowStep == Step.Network">
-    <SendNetwork v-if="!loading" @send-network="sendNetwork" />
+    <SendNetwork
+      :pixKey="pixKeyBuyer"
+      :offer="Number(offerValue)"
+      v-if="!loading"
+      @send-network="sendNetwork"
+    />
     <ValidationComponent
       v-if="loading"
       :message="'A transação está sendo enviada para a rede.'"