diff --git a/src/components/ListComponent.vue b/src/components/ListComponent.vue
index 8f6597a..4211256 100644
--- a/src/components/ListComponent.vue
+++ b/src/components/ListComponent.vue
@@ -3,10 +3,10 @@ import CustomButton from "@/components/CustomButton.vue";
 import blockchain from "../utils/blockchain";
 
 // props
-const props = defineProps({
-  lastWalletReleaseTransactions: Array,
-  tokenAmount: Number,
-});
+const props = defineProps<{
+  lastWalletReleaseTransactions: any[] | undefined;
+  tokenAmount: Number | undefined;
+}>();
 
 // Emits
 const emit = defineEmits(["makeAnotherTransaction"]);
diff --git a/src/router/index.ts b/src/router/index.ts
index 1bed140..116a89a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,6 @@
 import { createRouter, createWebHistory } from "vue-router";
 import HomeView from "../views/HomeView.vue";
 import MockView from "../views/MockView.vue";
-import ListView from "../components/ListComponent.vue";
 import SellerView from "@/views/SellerView.vue";
 
 const router = createRouter({
@@ -22,11 +21,6 @@ const router = createRouter({
       name: "mock",
       component: MockView,
     },
-    {
-      path: "/list",
-      name: "list",
-      component: ListView,
-    },
   ],
 });
 
diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts
index d1d6853..1098da3 100644
--- a/src/utils/blockchain.ts
+++ b/src/utils/blockchain.ts
@@ -276,7 +276,7 @@ const addDeposit = async (tokenQty: Number, pixKey: string) => {
 };
 
 // Get specific deposit data by its ID
-const mapDeposits = async (depositId: BigNumber) => {
+const mapDeposits = async (depositId: BigNumber): Promise<any> => {
   const provider = getProvider();
 
   if (!provider) return;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index a45b568..ca8dbcd 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -32,6 +32,10 @@ const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
   const depositId = selectedDeposit.depositID;
   pixTarget.value = selectedDeposit.pixKey;
   tokenAmount.value = tokenValue;
+  // depositId is BigNumber type object
+  tokenAmount.value = tokenValue;
+
+  pixTarget.value = String(depositDetail?.pixTarget);
 
   // Makes lock with deposit ID and the Amount
   if (depositDetail) {