diff --git a/src/components/BidHistory.vue b/src/components/BidHistory.vue
index d92ee3b..79be139 100644
--- a/src/components/BidHistory.vue
+++ b/src/components/BidHistory.vue
@@ -1,13 +1,13 @@
 <template>
   <Navbar />
   <div class="container" style="min-height: 100vh">
-    <button
+    <!-- <button
       class="btn btn-secondary float-start"
       style="margin: 5px"
       onclick="history.back()"
     >
       Kembali <i class="bi bi-backspace-fill"></i>
-    </button>
+    </button> -->
     <h1>Rekod Bidaan <i class="bi bi-receipt"></i></h1>
     <!-- <div class="card"> -->
       <div class="card-body">
diff --git a/src/components/Cart.vue b/src/components/Cart.vue
index fb463ca..006786f 100644
--- a/src/components/Cart.vue
+++ b/src/components/Cart.vue
@@ -10,13 +10,13 @@
   </div>
   <div v-else class="container">
     <div>
-      <button
+      <!-- <button
         class="btn btn-secondary float-start"
         style="margin: 5px"
         onclick="history.back()"
       >
         Kembali <i class="bi bi-backspace-fill"></i>
-      </button>
+      </button> -->
       <div class="wrapper wrapper-content animated fadeInRight">
         <h1>Troli <i class="bi bi-cart3"></i></h1>
         <div class="row">
diff --git a/src/components/IndexPaymentHistory.vue b/src/components/IndexPaymentHistory.vue
index 7603767..33e4719 100644
--- a/src/components/IndexPaymentHistory.vue
+++ b/src/components/IndexPaymentHistory.vue
@@ -1,13 +1,13 @@
 <template>
   <Navbar />
   <div class="container" style="min-height: 80vh">
-    <button
+    <!-- <button
       class="btn btn-secondary float-start"
       style="margin: 5px"
       onclick="history.back()"
     >
       Kembali <i class="bi bi-backspace-fill"></i>
-    </button>
+    </button> -->
     <h1>Rekod Bayaran <i class="bi bi-journal-text"></i></h1>
     <PaymentHistory />
   </div>
diff --git a/src/components/List.vue b/src/components/List.vue
index e5cc079..9ce0c5c 100644
--- a/src/components/List.vue
+++ b/src/components/List.vue
@@ -1,27 +1,33 @@
 <template>
   <Navbar />
-  <h6><button class="badge m-2 btn-secondary" @click="forceRerender">Reload Component <i class="bi bi-arrow-down"></i></button></h6>
   <!-- <router-view {{Modal}}><button class="btn btn-primary">sdsd</button></router-view> -->
   <!-- <Modal /> -->
   <div class="container">
-    <button
+    <!-- <button
       class="btn btn-secondary float-start"
       style="margin: 5px"
       onclick="history.back()"
     >
       Kembali <i class="bi bi-backspace-fill"></i>
-    </button>
+    </button> -->
     <h1>Senarai <i class="bi bi-card-list"></i></h1>
 
     <div class="input-group mb-3">
-      <span class="input-group-text" id="basic-addon3">Pilih Cawangan</span>
+      <span class="input-group-text" id="basic-addon3">Cawangan</span>
       <select class="form-select" @change="pilihCawangan($event)">
-        <option v-for="data in cawangan" :key="data.id">{{data.caw_name}}</option>
-        <input type="hidden" >
+        <option value="disabled" selected disabled>Sila Pilih Cawangan</option>
+        <option v-for="data in cawangan" :key="data.id" v-bind:value="data.caw_id">
+          {{ data.caw_name }}
+        </option>
+        <input type="hidden" />
       </select>
-      <!-- <button @click="selectCawangan(test)" type="submit" class="btn btn-primary">Cari</button> -->
     </div>
-  <Senarai :key="componentKey" cawangan="1"/>
+    <h6>
+    <button class="badge m-2 btn-secondary" @click="forceRerender">
+      Reload <i class="bi bi-arrow-down"></i>
+    </button>
+  </h6>
+    <Senarai :key="componentKey" :selectedCawangan="selectCawangan" />
   </div>
   <Footer />
 </template>
@@ -51,7 +57,7 @@ export default {
     Senarai,
     // Modal,
   },
-  mounted: function() {
+  mounted: function () {
     this.getIdCawangan();
   },
   methods: {
@@ -59,20 +65,20 @@ export default {
       this.componentKey += 1;
     },
     pilihCawangan(e) {
-
       let test = e.target.value;
-      console.log(test);
+      this.selectCawangan = test;
+      this.componentKey += 1;
 
     },
     getIdCawangan() {
       axios
-        .get("/listcawlelongtoday", {
+        .get("/listcawlelongtodaystarted", {
           headers: {
             Authorization: "Bearer " + localStorage.getItem("token"),
           },
         })
         .then((response) => {
-          this.cawangan = response.data.lelong
+          this.cawangan = response.data.lelong;
           console.log(response.data.lelong);
         })
         .catch((error) => {
diff --git a/src/components/Pay.vue b/src/components/Pay.vue
index 56f2509..fa975c8 100644
--- a/src/components/Pay.vue
+++ b/src/components/Pay.vue
@@ -1,13 +1,13 @@
 <template>
   <Navbar />
   <div class="container" style="min-height: 80vh">
-    <button
+    <!-- <button
       class="btn btn-secondary float-start"
       style="margin: 5px"
       onclick="history.back()"
     >
       Kembali <i class="bi bi-backspace-fill"></i>
-    </button>
+    </button> -->
     <div class="wrapper wrapper-content animated fadeInRight">
       <h1>Bayar <i class="bi bi-credit-card-2-front"></i></h1>
       <div class="row">
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index b5e8d1b..341288c 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -10,13 +10,13 @@
   </div> 
 
   <div v-else class="container">
-    <button
+    <!-- <button
       class="btn btn-secondary float-start"
       style="margin: 5px"
       onclick="history.back()"
     >
       Kembali <i class="bi bi-backspace-fill"></i>
-    </button>
+    </button> -->
     <h1>Profil <i class="bi bi-person-video"></i></h1>
     <div class="card">
       <!-- <div class="card-header"><h4>Profil</h4></div> -->
diff --git a/src/components/list/Senarai.vue b/src/components/list/Senarai.vue
index ef459b1..153f15e 100644
--- a/src/components/list/Senarai.vue
+++ b/src/components/list/Senarai.vue
@@ -6,12 +6,19 @@
     <div class="spinner-border" role="status">
       <span class="visually-hidden">Loading...</span>
     </div>
-      <p>{{cawangan}}</p>
   </div>
   
     <div v-else class="row">
-      <div class="col-9">
+      <div v-if="this.status">
+        <div class="">
         <div class="container">
+          <div class="row">
+            <div class="col">
+              <button disabled class="btn m-3 mb-1 btn-secondary">Jumlah Surat: {{this.sags.length}}</button>
+              <button disabled class="btn m-3 mb-1 btn-secondary">Masa Mula Lelong: {{ lelong_details.masamula_lelong }}</button>
+              <button disabled class="btn m-3 mb-1 btn-secondary">Masa Tamat Lelong: {{ lelong_details.masatamat_lelong }}</button>
+            </div>
+          </div>
           <div class="row clearfix">
             <div
               v-for="sag in sags"
@@ -39,7 +46,7 @@
                           data-bs-target="#bidaModal"
                           @click="clickModal(sag)"
                           class="btn btn-primary btn-sm waves-effect"
-                          >Enter <i class="zmdi zmdi-shopping-cart"></i
+                          >Masuk <i class="zmdi zmdi-shopping-cart"></i
                         ></a>
                       </div>
                     </div>
@@ -49,46 +56,10 @@
             </div>
           </div>
         </div>
+        </div>
       </div>
-      <div class="col-3">
-        <form>
-          <div class="ibox" style="border: solid 0.5px">
-            <div class="ibox-content">
-              <p class="font-bold">Info</p>
-              <hr />
-              <div>
-                <div class="small m-t-xs">
-                  <div class="d-flex justify-content-between">
-                    <p class="mb-0">Cawangan</p>
-                    <p class="mb-0">{{ lelong_details.lokasi }}</p>
-                  </div>
-                </div>
-                <hr />
-                <div class="small m-t-xs">
-                  <div class="d-flex justify-content-between">
-                    <p class="mb-0">Bilangan Lelongan</p>
-                    <p class="mb-0">{{ this.sags.length }} SAG</p>
-                  </div>
-                </div>
-                <hr />
-                <div class="small m-t-xs">
-                  <div class="d-flex justify-content-between">
-                    <p class="mb-0">Masa Mula</p>
-                    <p class="mb-0">{{ lelong_details.masamula_lelong }}</p>
-                  </div>
-                </div>
-                <hr />
-                <div class="small m-t-xs">
-                  <div class="d-flex justify-content-between">
-                    <p class="mb-0">Masa Tamat</p>
-                    <p class="mb-0">{{ lelong_details.masatamat_lelong }}</p>
-                  </div>
-                </div>
-              </div>
-              <hr />
-            </div>
-          </div>
-        </form>
+      <div v-else style="min-height: 60vh">
+        <h1 class="mt-5">Sila Isi Ruangan 'Pilih Cawangan' Di Atas.</h1>
       </div>
     </div>
 
@@ -220,7 +191,7 @@
               Batal
             </button>
             <button type="submit" class="btn btn-success" @click="addToCart()">
-              Add to Cart
+              Tambah Ke Troli
             </button>
           </div>
         </div>
@@ -242,10 +213,11 @@ export default {
     Senarai,
   },
   props: [
-    'cawangan'
+    'selectedCawangan'
   ],
   data() {
     return {
+      status: false,
       v$: useVuelidate(),
       loading: false,
       tambahabError: false,
@@ -262,7 +234,6 @@ export default {
         hargabida: "",
       },
       myModal: null,
-      cuba: this.cawangan,
     };
   },
   validations() {
@@ -282,21 +253,28 @@ export default {
   methods: {
     liveData() {
       this.loading = true;
+      this.status = false;
       axios
         .get("/lelongDetails/cawangan", {
           headers: {
             Authorization: "Bearer " + localStorage.getItem("token"),
           },
           params: {
-            caw_id: localStorage.getItem('lelong_id'),
+            caw_id: this.selectedCawangan,
           },
         })
         .then((response) => {
-          console.log(response)
-          this.lelong_details = response.data[0];
-          this.response = response.data[0].lelongbid;
+          if(response.data.success == true) {
+          this.status = true;
+          this.lelong_details = response.data.message[0];
+          this.response = response.data.message[0].lelongbid;
           this.sags = this.response;
-          this.loading = false;
+          this.loading = false; }
+          else {
+            this.status = false;
+            this.loading = false;
+            console.log(response.data.message);
+          }
         })
         .catch((error) => {
           console.log(error);
@@ -304,16 +282,6 @@ export default {
         });
     },
     clickModal(norujukan) {
-      // var headsets = this.allCarts;
-      // console.log(this.allCarts);
-      // this.allCarts.forEach(
-      // element
-
-      // console.log(element.lelongbid_id)
-      // console.log(this.allCarts.includes(norujukan.id));
-      // );
-
-      // console.log(norujukan);
       this.allCarts.forEach(function (element) {
         if (element.lelongbid_id == norujukan.id) {
           // return true;