From 3e6f5695a4aab3f222209c8c1d7cc6fc1d5ea55f Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Fri, 5 Jan 2024 19:20:19 +0530
Subject: [PATCH 01/13] Implemented :Spinner in Timezone Model for Timezone
 Configuration (#210)

---
 src/locales/en.json         |  1 +
 src/views/TimezoneModal.vue | 83 +++++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 07b5d7d1..39392806 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -37,6 +37,7 @@
   "Make sure you've reviewed the products and their counts before uploading them for review": "Make sure you've reviewed the products and their counts before uploading them for review",
   "No results found": "No results found",
   "No time zone found": "No time zone found",
+  "Fetching time zones":"Fetching time zones",
   "Ok": "Ok",
   "OMS": "OMS",
   "OMS instance": "OMS instance",
diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index 4db695e8..6f21c36c 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -2,44 +2,60 @@
   <ion-header>
     <ion-toolbar>
       <ion-buttons slot="start">
-        <ion-button @click="closeModal"> 
+        <ion-button @click="closeModal">
           <ion-icon :icon="close" />
         </ion-button>
       </ion-buttons>
       <ion-title>{{ $t("Select time zone") }}</ion-title>
     </ion-toolbar>
     <ion-toolbar>
-      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')"  v-model="queryString" @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
+      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString"
+        @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
     </ion-toolbar>
   </ion-header>
-
+ 
+ 
   <ion-content class="ion-padding">
     <!-- Empty state -->
-    <div class="empty-state" v-if="filteredTimeZones.length === 0">
-      <p>{{ $t("No time zone found")}}</p>
+    <div>
+      <div class="empty-state" v-if="loading && timeZones.length === 0">
+        <ion-item lines="none" color="none">
+          
+          <ion-spinner class="center-spinner" color="secondary" name="crescent" slot="start" ></ion-spinner>
+          {{ $t("Fetching time zones") }}
+        </ion-item>
+      </div>
     </div>
-
+    <div v-if="!loading && filteredTimeZones.length === 0">
+      <div class="empty-state">
+        <p>{{ $t("No time zone found") }}</p>
+      </div>
+    </div>
+ 
     <!-- Timezones -->
     <div v-else>
       <ion-list>
         <ion-radio-group value="rd" v-model="timeZoneId">
           <ion-item :key="timeZone.id" v-for="timeZone in filteredTimeZones">
-            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id }})</ion-radio>
+            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id
+            }})</ion-radio>
           </ion-item>
         </ion-radio-group>
       </ion-list>
     </div>
-    
+ 
+
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
       <ion-fab-button :disabled="!timeZoneId" @click="saveAlert">
         <ion-icon :icon="save" />
       </ion-fab-button>
     </ion-fab>
   </ion-content>
-</template>
-
-<script lang="ts">
-import { 
+ </template>
+ 
+ 
+ <script lang="ts">
+ import {
   IonButtons,
   IonButton,
   IonContent,
@@ -55,17 +71,19 @@ import {
   IonTitle,
   IonToolbar,
   modalController,
-  alertController } from "@ionic/vue";
-import { defineComponent } from "vue";
-import { close, save } from "ionicons/icons";
-import { useStore } from "@/store";
-import { UserService } from "@/services/UserService";
-import { hasError } from '@/utils'
-import { DateTime } from 'luxon';
-
-export default defineComponent({
+  alertController
+ } from "@ionic/vue";
+ import { defineComponent } from "vue";
+ import { close, save } from "ionicons/icons";
+ import { useStore } from "@/store";
+ import { UserService } from "@/services/UserService";
+ import { hasError } from '@/utils'
+ import { DateTime } from 'luxon';
+ 
+ 
+ export default defineComponent({
   name: "TimeZoneModal",
-  components: { 
+  components: {
     IonButtons,
     IonButton,
     IonContent,
@@ -79,14 +97,15 @@ export default defineComponent({
     IonRadio,
     IonSearchbar,
     IonTitle,
-    IonToolbar 
+    IonToolbar
   },
   data() {
     return {
       queryString: '',
       filteredTimeZones: [],
       timeZones: [],
-      timeZoneId: ''
+      timeZoneId: '',
+      loading: true
     }
   },
   methods: {
@@ -114,9 +133,9 @@ export default defineComponent({
     },
     preventSpecialCharacters($event: any) {
       // Searching special characters fails the API, hence, they must be omitted
-      if(/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
+      if (/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
     },
-    findTimeZone() { 
+    findTimeZone() {
       const queryString = this.queryString.toLowerCase();
       this.filteredTimeZones = this.timeZones.filter((timeZone: any) => {
         return timeZone.id.toLowerCase().match(queryString) || timeZone.label.toLowerCase().match(queryString);
@@ -124,13 +143,16 @@ export default defineComponent({
     },
     async getAvailableTimeZones() {
       const resp = await UserService.getAvailableTimeZones()
-      if(resp.status === 200 && !hasError(resp)) {
+      console.log(resp);
+      
+      if (resp.status === 200 && !hasError(resp)) {
         // We are filtering valid the timeZones coming with response here
         this.timeZones = resp.data.filter((timeZone: any) => {
           return DateTime.local().setZone(timeZone.id).isValid;
         });
         this.findTimeZone();
       }
+      this.loading = false;
     },
     async selectSearchBarText(event: any) {
       const element = await event.target.getInputElement()
@@ -143,7 +165,7 @@ export default defineComponent({
       this.closeModal()
     }
   },
-  beforeMount () {
+  beforeMount() {
     this.getAvailableTimeZones();
   },
   setup() {
@@ -154,5 +176,6 @@ export default defineComponent({
       store
     };
   }
-});
-</script>
\ No newline at end of file
+ });
+ </script>
+ 
\ No newline at end of file

From aabd644247dc3d298596ff534f251f2f864c0e73 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Sat, 6 Jan 2024 12:28:44 +0530
Subject: [PATCH 02/13] Fixed: Reverted unwanted changes

---
 src/views/TimezoneModal.vue | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index 6f21c36c..5b9ae04f 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -9,8 +9,8 @@
       <ion-title>{{ $t("Select time zone") }}</ion-title>
     </ion-toolbar>
     <ion-toolbar>
-      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString"
-        @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
+      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString" @keyup.enter="queryString = $event.target.value; 
+  findTimeZone()" @keydown="preventSpecialCharacters($event)" />
     </ion-toolbar>
   </ion-header>
  
@@ -26,10 +26,8 @@
         </ion-item>
       </div>
     </div>
-    <div v-if="!loading && filteredTimeZones.length === 0">
-      <div class="empty-state">
+    <div class="empty-state" v-if="!loading && filteredTimeZones.length === 0">
         <p>{{ $t("No time zone found") }}</p>
-      </div>
     </div>
  
     <!-- Timezones -->
@@ -37,14 +35,12 @@
       <ion-list>
         <ion-radio-group value="rd" v-model="timeZoneId">
           <ion-item :key="timeZone.id" v-for="timeZone in filteredTimeZones">
-            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id
-            }})</ion-radio>
+            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id}})</ion-radio>
           </ion-item>
         </ion-radio-group>
       </ion-list>
     </div>
  
-
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
       <ion-fab-button :disabled="!timeZoneId" @click="saveAlert">
         <ion-icon :icon="save" />
@@ -53,7 +49,6 @@
   </ion-content>
  </template>
  
- 
  <script lang="ts">
  import {
   IonButtons,
@@ -80,7 +75,6 @@
  import { hasError } from '@/utils'
  import { DateTime } from 'luxon';
  
- 
  export default defineComponent({
   name: "TimeZoneModal",
   components: {
@@ -133,7 +127,7 @@
     },
     preventSpecialCharacters($event: any) {
       // Searching special characters fails the API, hence, they must be omitted
-      if (/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
+      if(/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
     },
     findTimeZone() {
       const queryString = this.queryString.toLowerCase();
@@ -143,8 +137,6 @@
     },
     async getAvailableTimeZones() {
       const resp = await UserService.getAvailableTimeZones()
-      console.log(resp);
-      
       if (resp.status === 200 && !hasError(resp)) {
         // We are filtering valid the timeZones coming with response here
         this.timeZones = resp.data.filter((timeZone: any) => {

From a894494c76e4130b92eb9928044d505845b7255d Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 10:55:18 +0530
Subject: [PATCH 03/13] Fixed: Reverted unwanted changes

---
 src/views/TimezoneModal.vue | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index 5b9ae04f..ff2a36b4 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -21,7 +21,7 @@
       <div class="empty-state" v-if="loading && timeZones.length === 0">
         <ion-item lines="none" color="none">
           
-          <ion-spinner class="center-spinner" color="secondary" name="crescent" slot="start" ></ion-spinner>
+          <ion-spinner color="secondary" name="crescent" slot="start" ></ion-spinner>
           {{ $t("Fetching time zones") }}
         </ion-item>
       </div>
@@ -47,10 +47,10 @@
       </ion-fab-button>
     </ion-fab>
   </ion-content>
- </template>
+</template>
  
- <script lang="ts">
- import {
+<script lang="ts">
+import {
   IonButtons,
   IonButton,
   IonContent,
@@ -66,18 +66,17 @@
   IonTitle,
   IonToolbar,
   modalController,
-  alertController
- } from "@ionic/vue";
- import { defineComponent } from "vue";
- import { close, save } from "ionicons/icons";
- import { useStore } from "@/store";
- import { UserService } from "@/services/UserService";
- import { hasError } from '@/utils'
- import { DateTime } from 'luxon';
+  alertController } from "@ionic/vue";
+import { defineComponent } from "vue";
+import { close, save } from "ionicons/icons";
+import { useStore } from "@/store";
+import { UserService } from "@/services/UserService";
+import { hasError } from '@/utils'
+import { DateTime } from 'luxon';
  
- export default defineComponent({
+export default defineComponent({
   name: "TimeZoneModal",
-  components: {
+  components: { 
     IonButtons,
     IonButton,
     IonContent,

From fa30057798539f0d53a62e2c6fb5095232502e6b Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 11:17:36 +0530
Subject: [PATCH 04/13] Reverted: Removed unwanted changes such as spacing ,
 indentation ,extra lines (#210)

---
 src/views/TimezoneModal.vue | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index ff2a36b4..9f3cff1a 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -2,19 +2,17 @@
   <ion-header>
     <ion-toolbar>
       <ion-buttons slot="start">
-        <ion-button @click="closeModal">
+        <ion-button @click="closeModal"> 
           <ion-icon :icon="close" />
         </ion-button>
       </ion-buttons>
       <ion-title>{{ $t("Select time zone") }}</ion-title>
     </ion-toolbar>
     <ion-toolbar>
-      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString" @keyup.enter="queryString = $event.target.value; 
-  findTimeZone()" @keydown="preventSpecialCharacters($event)" />
+      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString" @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
     </ion-toolbar>
   </ion-header>
  
- 
   <ion-content class="ion-padding">
     <!-- Empty state -->
     <div>
@@ -35,12 +33,12 @@
       <ion-list>
         <ion-radio-group value="rd" v-model="timeZoneId">
           <ion-item :key="timeZone.id" v-for="timeZone in filteredTimeZones">
-            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id}})</ion-radio>
+            <ion-radio justify="start" label-placement="end" :value="timeZone.id">{{ timeZone.label }} ({{ timeZone.id }})</ion-radio>
           </ion-item>
         </ion-radio-group>
       </ion-list>
     </div>
- 
+        
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
       <ion-fab-button :disabled="!timeZoneId" @click="saveAlert">
         <ion-icon :icon="save" />
@@ -50,7 +48,7 @@
 </template>
  
 <script lang="ts">
-import {
+import { 
   IonButtons,
   IonButton,
   IonContent,
@@ -73,7 +71,7 @@ import { useStore } from "@/store";
 import { UserService } from "@/services/UserService";
 import { hasError } from '@/utils'
 import { DateTime } from 'luxon';
- 
+
 export default defineComponent({
   name: "TimeZoneModal",
   components: { 
@@ -90,7 +88,7 @@ export default defineComponent({
     IonRadio,
     IonSearchbar,
     IonTitle,
-    IonToolbar
+    IonToolbar 
   },
   data() {
     return {
@@ -128,7 +126,7 @@ export default defineComponent({
       // Searching special characters fails the API, hence, they must be omitted
       if(/[`!@#$%^&*()_+\-=\\|,.<>?~]/.test($event.key)) $event.preventDefault();
     },
-    findTimeZone() {
+    findTimeZone() { 
       const queryString = this.queryString.toLowerCase();
       this.filteredTimeZones = this.timeZones.filter((timeZone: any) => {
         return timeZone.id.toLowerCase().match(queryString) || timeZone.label.toLowerCase().match(queryString);
@@ -136,7 +134,7 @@ export default defineComponent({
     },
     async getAvailableTimeZones() {
       const resp = await UserService.getAvailableTimeZones()
-      if (resp.status === 200 && !hasError(resp)) {
+      if(resp.status === 200 && !hasError(resp)) {
         // We are filtering valid the timeZones coming with response here
         this.timeZones = resp.data.filter((timeZone: any) => {
           return DateTime.local().setZone(timeZone.id).isValid;
@@ -156,7 +154,7 @@ export default defineComponent({
       this.closeModal()
     }
   },
-  beforeMount() {
+  beforeMount () {
     this.getAvailableTimeZones();
   },
   setup() {
@@ -169,4 +167,3 @@ export default defineComponent({
   }
  });
  </script>
- 
\ No newline at end of file

From 7db799e2e95049da680a90d6fae10857156bd294 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 11:19:26 +0530
Subject: [PATCH 05/13] Reverted: Removed unwanted changes such as spacing ,
 indentation ,extra lines (#210)

---
 src/views/TimezoneModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index 9f3cff1a..c3907c66 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -38,7 +38,7 @@
         </ion-radio-group>
       </ion-list>
     </div>
-        
+  
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
       <ion-fab-button :disabled="!timeZoneId" @click="saveAlert">
         <ion-icon :icon="save" />

From ea00179fae2e8a4841f10cb78bcef50bde3c8a54 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 12:30:08 +0530
Subject: [PATCH 06/13] Improved: refined the if-else logic in spinner

---
 src/views/TimezoneModal.vue | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index c3907c66..ee5a89ed 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -12,22 +12,19 @@
       <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString" @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
     </ion-toolbar>
   </ion-header>
- 
+
   <ion-content class="ion-padding">
     <!-- Empty state -->
-    <div>
-      <div class="empty-state" v-if="loading && timeZones.length === 0">
-        <ion-item lines="none" color="none">
-          
-          <ion-spinner color="secondary" name="crescent" slot="start" ></ion-spinner>
-          {{ $t("Fetching time zones") }}
-        </ion-item>
-      </div>
+    <div class="empty-state" v-if="loading">
+      <ion-item lines="none" >
+        <ion-spinner color="secondary" name="crescent" slot="start" ></ion-spinner>
+        {{ $t("Fetching time zones") }}
+      </ion-item>
     </div>
-    <div class="empty-state" v-if="!loading && filteredTimeZones.length === 0">
-        <p>{{ $t("No time zone found") }}</p>
+    <div class="empty-state" v-else-if="filteredTimeZones.length === 0">
+      <p>{{ $t("No time zone found") }}</p>
     </div>
- 
+
     <!-- Timezones -->
     <div v-else>
       <ion-list>
@@ -38,7 +35,7 @@
         </ion-radio-group>
       </ion-list>
     </div>
-  
+    
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
       <ion-fab-button :disabled="!timeZoneId" @click="saveAlert">
         <ion-icon :icon="save" />
@@ -46,7 +43,7 @@
     </ion-fab>
   </ion-content>
 </template>
- 
+
 <script lang="ts">
 import { 
   IonButtons,
@@ -141,7 +138,7 @@ export default defineComponent({
         });
         this.findTimeZone();
       }
-      this.loading = false;
+    this.loading = false;
     },
     async selectSearchBarText(event: any) {
       const element = await event.target.getInputElement()
@@ -165,5 +162,5 @@ export default defineComponent({
       store
     };
   }
- });
- </script>
+});
+</script>

From 7d7e3e6b377d17297763b213e34fc5014c67ed4b Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 12:31:01 +0530
Subject: [PATCH 07/13] Improved: refined the if-else logic in spinner

---
 src/views/TimezoneModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index ee5a89ed..e1bd9104 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -163,4 +163,4 @@ export default defineComponent({
     };
   }
 });
-</script>
+</script>
\ No newline at end of file

From 9dbc25b098344ab7f08f82240a17bdf451a10978 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 12:32:00 +0530
Subject: [PATCH 08/13] Improved: refined the if-else logic in spinner

---
 src/views/TimezoneModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index e1bd9104..a240fff4 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -9,7 +9,7 @@
       <ion-title>{{ $t("Select time zone") }}</ion-title>
     </ion-toolbar>
     <ion-toolbar>
-      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')" v-model="queryString" @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
+      <ion-searchbar @ionFocus="selectSearchBarText($event)" :placeholder="$t('Search time zones')"  v-model="queryString" @keyup.enter="queryString = $event.target.value; findTimeZone()" @keydown="preventSpecialCharacters($event)" />
     </ion-toolbar>
   </ion-header>
 

From 65a328b3103da32fe73cc02ad9258d65c6c3a8d0 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 12:47:22 +0530
Subject: [PATCH 09/13] Improved: removed spaces and used self closing tag in
 spinner

---
 src/views/TimezoneModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index a240fff4..d6c2d98d 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -16,8 +16,8 @@
   <ion-content class="ion-padding">
     <!-- Empty state -->
     <div class="empty-state" v-if="loading">
-      <ion-item lines="none" >
-        <ion-spinner color="secondary" name="crescent" slot="start" ></ion-spinner>
+      <ion-item lines="none">
+        <ion-spinner color="secondary" name="crescent" slot="start" />
         {{ $t("Fetching time zones") }}
       </ion-item>
     </div>

From e0ab27fe94be4bf73eba4223d847c210c0199d68 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Mon, 8 Jan 2024 12:49:17 +0530
Subject: [PATCH 10/13] Fixed: added space

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 39392806..0854e10c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -37,7 +37,7 @@
   "Make sure you've reviewed the products and their counts before uploading them for review": "Make sure you've reviewed the products and their counts before uploading them for review",
   "No results found": "No results found",
   "No time zone found": "No time zone found",
-  "Fetching time zones":"Fetching time zones",
+  "Fetching time zones": "Fetching time zones",
   "Ok": "Ok",
   "OMS": "OMS",
   "OMS instance": "OMS instance",

From 85cdac85e1a8c453461b8053ac93309af0f788c3 Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Tue, 9 Jan 2024 10:39:01 +0530
Subject: [PATCH 11/13] Improved: replaced the  variable name 'loading' to
 'isLoading'

---
 src/views/TimezoneModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index d6c2d98d..782f69a3 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -15,7 +15,7 @@
 
   <ion-content class="ion-padding">
     <!-- Empty state -->
-    <div class="empty-state" v-if="loading">
+    <div class="empty-state" v-if="isLoading">
       <ion-item lines="none">
         <ion-spinner color="secondary" name="crescent" slot="start" />
         {{ $t("Fetching time zones") }}
@@ -93,7 +93,7 @@ export default defineComponent({
       filteredTimeZones: [],
       timeZones: [],
       timeZoneId: '',
-      loading: true
+      isLoading: true
     }
   },
   methods: {
@@ -138,7 +138,7 @@ export default defineComponent({
         });
         this.findTimeZone();
       }
-    this.loading = false;
+    this.isLoading = false;
     },
     async selectSearchBarText(event: any) {
       const element = await event.target.getInputElement()

From 7df6acaddb606470aac280a9deba6481c6ff193f Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Tue, 9 Jan 2024 17:02:45 +0530
Subject: [PATCH 12/13] Improved: isLoading value to false initially and
 changing the value according the API call

---
 src/views/TimezoneModal.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index 782f69a3..caf9b0e2 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -93,7 +93,7 @@ export default defineComponent({
       filteredTimeZones: [],
       timeZones: [],
       timeZoneId: '',
-      isLoading: true
+      isLoading: false
     }
   },
   methods: {
@@ -130,6 +130,7 @@ export default defineComponent({
       });
     },
     async getAvailableTimeZones() {
+      this.isLoading = true;
       const resp = await UserService.getAvailableTimeZones()
       if(resp.status === 200 && !hasError(resp)) {
         // We are filtering valid the timeZones coming with response here

From f93a39a9223f5f35a01bd596d8e837e8222d318d Mon Sep 17 00:00:00 2001
From: Ritika-Patel08 <ritikapatel8870@gmail.com>
Date: Tue, 9 Jan 2024 17:04:49 +0530
Subject: [PATCH 13/13] Improved: isLoading value to false initially and
 changing the value according the API call

---
 src/views/TimezoneModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TimezoneModal.vue b/src/views/TimezoneModal.vue
index caf9b0e2..bc5846ea 100644
--- a/src/views/TimezoneModal.vue
+++ b/src/views/TimezoneModal.vue
@@ -139,7 +139,7 @@ export default defineComponent({
         });
         this.findTimeZone();
       }
-    this.isLoading = false;
+      this.isLoading = false;
     },
     async selectSearchBarText(event: any) {
       const element = await event.target.getInputElement()