From a655202faa1d38cccac6f102b27cd21bcc6bd8fc Mon Sep 17 00:00:00 2001
From: Mateusz Rybczonek <m.rybczonek@gmail.com>
Date: Tue, 27 Feb 2024 11:05:58 +0100
Subject: [PATCH 1/7] feat: implement get and set zome calls

---
 .../hostingPreferences/BaseCombobox.vue       |  23 +++-
 .../CategoryExclusionSelect.vue               |  35 ------
 .../hostingPreferences/ExclusionSelect.vue    |  32 ++++++
 .../HAppSelectionSection.vue                  | 101 ++++++++++++++---
 src/interfaces/HposInterface.ts               | 102 +++++++++++++++++-
 src/pages/HostingPreferences.vue              |  10 +-
 src/store/preferences.ts                      |  62 +++++++++--
 src/types/predicates.ts                       |  13 ++-
 src/types/types.ts                            |  11 ++
 9 files changed, 323 insertions(+), 66 deletions(-)
 delete mode 100644 src/components/settings/hostingPreferences/CategoryExclusionSelect.vue
 create mode 100644 src/components/settings/hostingPreferences/ExclusionSelect.vue

diff --git a/src/components/settings/hostingPreferences/BaseCombobox.vue b/src/components/settings/hostingPreferences/BaseCombobox.vue
index 936c1124..039dbe24 100644
--- a/src/components/settings/hostingPreferences/BaseCombobox.vue
+++ b/src/components/settings/hostingPreferences/BaseCombobox.vue
@@ -25,18 +25,19 @@ const props = withDefaults(
     isLoading?: boolean
     isSaving?: boolean
     label?: string
+    initiallySelected?: string[]
   }>(),
   {
     options: () => [],
     isLoading: false,
     isSaving: false,
-    label: ''
+    label: '',
+    initiallySelected: () => []
   }
 )
 
 const isEditing = ref(false)
 
-const initiallySelected: string[] = []
 const previouslySelected = ref<Option[]>([])
 
 const mappedValues: Option[] = props.options.map((label, index) => ({
@@ -45,7 +46,7 @@ const mappedValues: Option[] = props.options.map((label, index) => ({
 }))
 
 const selectedOptions = ref<Option[]>(
-  mappedValues.filter((option) => initiallySelected.includes(option.label))
+  mappedValues.filter((option) => props.initiallySelected.includes(option.label))
 )
 
 const visibleOptions = computed(() => {
@@ -85,7 +86,10 @@ function removeOption(optionToBeRemoved: Option): void {
 }
 
 function save(): void {
-  emit('save', selectedOptions.value)
+  emit(
+    'save',
+    selectedOptions.value.map((option) => option.label)
+  )
 }
 
 function cancel(): void {
@@ -156,15 +160,18 @@ watch(
         </BaseTooltip>
       </CategoryChip>
     </div>
+
     <span
       v-else
       class="exclusion-select__exclusions-selected"
     >
       None
     </span>
+
     <PencilIcon
       v-if="!isEditing"
       class="exclusion-select__exclusions-edit-icon"
+      :class="{ 'exclusion-select__exclusions-edit-icon--disabled': props.isSaving }"
       @click="edit"
     />
 
@@ -261,6 +268,12 @@ watch(
       margin-left: 8px;
       margin-top: 4px;
       cursor: pointer;
+
+      &--disabled {
+        opacity: 0.15;
+        pointer-events: none;
+        cursor: not-allowed;
+      }
     }
 
     &-combobox {
@@ -283,6 +296,8 @@ watch(
 
       &--disabled {
         opacity: 0.15;
+        pointer-events: none;
+        cursor: not-allowed;
       }
     }
 
diff --git a/src/components/settings/hostingPreferences/CategoryExclusionSelect.vue b/src/components/settings/hostingPreferences/CategoryExclusionSelect.vue
deleted file mode 100644
index 6e2833c8..00000000
--- a/src/components/settings/hostingPreferences/CategoryExclusionSelect.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import ExclusionSelect from '@/components/settings/hostingPreferences/BaseCombobox.vue'
-import { categories } from '@/constants/categories'
-
-const props = withDefaults(
-  defineProps<{
-    label?: string
-  }>(),
-  {
-    label: ''
-  }
-)
-
-const isSaving = ref(false)
-
-function save(): void {
-  isSaving.value = true
-  // Make an API call to save new selected options
-
-  setTimeout(() => {
-    isSaving.value = false
-    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-  }, 2000)
-}
-</script>
-
-<template>
-  <ExclusionSelect
-    :label="props.label"
-    :options="categories"
-    :is-saving="isSaving"
-    @save="save"
-  />
-</template>
diff --git a/src/components/settings/hostingPreferences/ExclusionSelect.vue b/src/components/settings/hostingPreferences/ExclusionSelect.vue
new file mode 100644
index 00000000..38868dba
--- /dev/null
+++ b/src/components/settings/hostingPreferences/ExclusionSelect.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import ExclusionSelect from '@/components/settings/hostingPreferences/BaseCombobox.vue'
+
+const props = withDefaults(
+  defineProps<{
+    label?: string
+    options: string[]
+    isBusy: boolean
+    initiallySelected?: string[]
+  }>(),
+  {
+    label: '',
+    initiallySelected: () => []
+  }
+)
+
+const emit = defineEmits(['save'])
+
+function save(selectedOptions: string[]): void {
+  emit('save', selectedOptions)
+}
+</script>
+
+<template>
+  <ExclusionSelect
+    :label="props.label"
+    :options="props.options"
+    :is-saving="props.isBusy"
+    :initially-selected="props.initiallySelected"
+    @save="save"
+  />
+</template>
diff --git a/src/components/settings/hostingPreferences/HAppSelectionSection.vue b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
index 64ea0b1d..1075ec1c 100644
--- a/src/components/settings/hostingPreferences/HAppSelectionSection.vue
+++ b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
@@ -1,7 +1,51 @@
 <script setup lang="ts">
+import { ref } from 'vue'
 import SettingsSection from '../SettingsSection.vue'
-import CategoryExclusionSelect from '@/components/settings/hostingPreferences/CategoryExclusionSelect.vue'
-import JurisdictionExclusionSelect from '@/components/settings/hostingPreferences/JurisdictionExclusionSelect.vue'
+import ExclusionSelect from '@/components/settings/hostingPreferences/ExclusionSelect.vue'
+import { categories } from '@/constants/categories'
+import { countries } from '@/constants/countries'
+import { usePreferencesStore } from '@/store/preferences'
+import type { HostingJurisdictions } from '@/types/types'
+import { ECriteriaType } from '@/types/types'
+
+const preferencesStore = usePreferencesStore()
+
+const props = defineProps<{
+  hostingJurisdictions: HostingJurisdictions
+}>()
+
+const isJurisdictionExclusionsBusy = ref(false)
+const isHostingCategoriesExclusionsBusy = ref(false)
+
+async function saveHostingJurisdictions(
+  value: string[],
+  criteriaType: ECriteriaType
+): Promise<void> {
+  isJurisdictionExclusionsBusy.value = true
+
+  const payload = {
+    criteria_type: criteriaType,
+    value
+  }
+
+  // Make an API call to save new selected options
+  try {
+    await preferencesStore.setHostingJurisdictions(payload)
+    isJurisdictionExclusionsBusy.value = false
+  } catch (error) {
+    isJurisdictionExclusionsBusy.value = false
+  }
+}
+
+function saveHostingCategoriesExclusions(): void {
+  isHostingCategoriesExclusionsBusy.value = true
+  // Make an API call to save new selected options
+
+  setTimeout(() => {
+    isHostingCategoriesExclusionsBusy.value = false
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+  }, 2000)
+}
 </script>
 
 <template>
@@ -10,20 +54,50 @@ import JurisdictionExclusionSelect from '@/components/settings/hostingPreference
     class="happ-selection-section"
   >
     <div class="card-content">
-      <JurisdictionExclusionSelect />
+      <div class="happ-selection-section__tags">
+        <span class="happ-selection-section__selection-label happ-selection-section__selection-label--main">
+          {{ $t('hosting_preferences.happ_selection.jurisdiction_exclusions') }}
+        </span>
+        <div class="happ-selection-section__tags-item happ-selection-section__tags-item-exclude">
+          <ExclusionSelect
+            :key="props.hostingJurisdictions.timestamp"
+            label="hosting_preferences.happ_selection.exclude"
+            :options="countries"
+            :is-busy="isJurisdictionExclusionsBusy"
+            :initially-selected="props.hostingJurisdictions.criteriaType === ECriteriaType.exclude ? props.hostingJurisdictions.value : []"
+            @save="saveHostingJurisdictions($event, ECriteriaType.exclude)"
+          />
+        </div>
+        <div class="happ-selection-section__tags-item happ-selection-section__tags-item-include">
+          <ExclusionSelect
+            :key="props.hostingJurisdictions.timestamp"
+            label="hosting_preferences.happ_selection.include"
+            :options="countries"
+            :is-busy="isJurisdictionExclusionsBusy"
+            :initially-selected="props.hostingJurisdictions.criteriaType === 'include' ? props.hostingJurisdictions.value : []"
+            @save="saveHostingJurisdictions($event, ECriteriaType.include)"
+          />
+        </div>
+      </div>
 
-      <div class="happ-selection-section__category-tags">
+      <div class="happ-selection-section__tags happ-selection-section--category">
         <span class="happ-selection-section__selection-label happ-selection-section__selection-label--main">
           {{ $t('hosting_preferences.happ_selection.category_tags') }}
         </span>
-        <div class="happ-selection-section__category-tags-item happ-selection-section__category-tags-item-exclude">
-          <CategoryExclusionSelect
+        <div class="happ-selection-section__tags-item happ-selection-section__tags-item-exclude">
+          <ExclusionSelect
             label="hosting_preferences.happ_selection.exclude"
+            :options="categories"
+            :is-busy="isHostingCategoriesExclusionsBusy"
+            @save="saveHostingCategoriesExclusions"
           />
         </div>
-        <div class="happ-selection-section__category-tags-item happ-selection-section__category-tags-item-include">
-          <CategoryExclusionSelect
+        <div class="happ-selection-section__tags-item happ-selection-section__tags-item-include">
+          <ExclusionSelect
             label="hosting_preferences.happ_selection.include"
+            :options="categories"
+            :is-busy="isHostingCategoriesExclusionsBusy"
+            @save="saveHostingCategoriesExclusions"
           />
         </div>
       </div>
@@ -34,12 +108,15 @@ import JurisdictionExclusionSelect from '@/components/settings/hostingPreference
 <style lang="scss" scoped>
 .card-content {
   padding: 0 0 35px 0;
-  opacity: 0.5;
-  pointer-events: none;
 }
 
 .happ-selection-section {
-  &__category-tags {
+  &--category {
+    opacity: 0.5;
+    pointer-events: none;
+  }
+
+  &__tags {
     margin-top: 16px;
 
     &-selected {
@@ -49,7 +126,7 @@ import JurisdictionExclusionSelect from '@/components/settings/hostingPreference
     }
   }
 
-  &__category-tags-item {
+  &__tags-item {
     margin-top: 12px;
     padding-left: 40px;
     display: flex;
diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index bd0efe85..9e9563f0 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -1,13 +1,12 @@
 /* eslint-disable camelcase */
 import { decode } from '@msgpack/msgpack'
 import axios from 'axios'
-import { decodeAgentId } from '../../ui-common-library/src/utils/agent'
 import { kAuthTokenLSKey, kCoreAppVersionLSKey } from '@/constants'
 import kHttpStatus from '@/constants/httpStatues'
 import router from '@/router'
 import { isKycLevel } from '@/types/predicates'
 import type { CheckAuthResponse, EUserKycLevel, PricesData } from '@/types/types'
-import { EHostingPlan } from '@/types/types'
+import { ECriteriaType, EHostingPlan } from '@/types/types'
 import { retry } from '@/utils/functionUtils'
 import { eraseHpAdminKeypair, getHpAdminKeypair } from '@/utils/keyManagement'
 
@@ -35,6 +34,10 @@ interface HposInterface {
   getCoreAppVersion: () => Promise<CoreAppVersion>
   redeemHoloFuel: (payload: RedeemHoloFuelPayload) => Promise<RedemptionTransaction | boolean>
   HPOS_API_URL: string
+  getHostingJurisdictions: () => Promise<HposHolochainCallResponse | { error: unknown }>
+  setHostingJurisdictions: (
+    payload: SetHostingJurisdictionsPayload
+  ) => Promise<HposHolochainCallResponse | { error: unknown }>
 }
 
 interface UpdateHAppHostingPlanPayload {
@@ -122,6 +125,18 @@ export interface HostPreferencesResponse {
   invoice_due_in_days: number
 }
 
+export interface HostingJurisdictionsResponse {
+  timestamp: number
+  criteria_type: any
+  value: string[]
+}
+
+export interface SetHostingJurisdictionsPayload {
+  holoport_id?: string
+  criteria_type: ECriteriaType
+  value: string[]
+}
+
 export interface DefaultPreferencesPayload {
   price_compute: string
   price_storage: string
@@ -147,6 +162,7 @@ type HposHolochainCallResponse =
   | EUserKycLevel
   | ServiceLogsResponse
   | ZomeCallResponse
+  | HostingJurisdictionsResponse
 
 type HposAdminCallResponse = HposConfigResponse
 
@@ -648,6 +664,83 @@ export function useHposInterface(): HposInterface {
     }
   }
 
+  async function getHostingJurisdictions(): Promise<
+    HposHolochainCallResponse | { error: unknown }
+    > {
+    let holoportId = ''
+
+    if (window.location.host.split(':')[0] === 'localhost') {
+      const holoportUrl = `${import.meta.env.VITE_HOLOPORT_URL}` || ''
+      holoportId = holoportUrl.split('//')[1]?.split('.')[0] ?? ''
+    } else {
+      holoportId = window.location.host.split('//')[1]?.split('.')[0] ?? ''
+    }
+
+    const params = {
+      appId: localStorage.getItem(kCoreAppVersionLSKey),
+      roleId: 'core-app',
+      zomeName: 'hha',
+      fnName: 'get_hosting_jurisdictions',
+      payload: holoportId
+    }
+
+    try {
+      const hostingJurisdictions = await hposHolochainCall({
+        method: 'post',
+        path: '/zome_call',
+        pathPrefix: '/api/v2',
+        responseType: 'arraybuffer',
+        params
+      })
+
+      return hostingJurisdictions
+    } catch (error) {
+      console.error('getHostingJurisdictions encountered an error: ', error)
+      return {
+        criteria_type: { Include: null },
+        value: ['Poland'],
+        timestamp: 0
+      }
+
+      // return false
+    }
+  }
+
+  async function setHostingJurisdictions(
+    payload: SetHostingJurisdictionsPayload
+  ): Promise<boolean> {
+    let holoportId = ''
+
+    if (window.location.host.split(':')[0] === 'localhost') {
+      const holoportUrl = `${import.meta.env.VITE_HOLOPORT_URL}` || ''
+      holoportId = holoportUrl.split('//')[1]?.split('.')[0] ?? ''
+    } else {
+      holoportId = window.location.host.split('//')[1]?.split('.')[0] ?? ''
+    }
+
+    try {
+      const params = {
+        appId: localStorage.getItem(kCoreAppVersionLSKey),
+        roleId: 'core-app',
+        zomeName: 'hha',
+        fnName: 'set_hosting_jurisdictions',
+        payload: { holoport_id: holoportId, ...payload }
+      }
+
+      await hposHolochainCall({
+        method: 'post',
+        path: '/zome_call',
+        pathPrefix: '/api/v2',
+        responseType: 'arraybuffer',
+        params
+      })
+
+      return true
+    } catch (error) {
+      return false
+    }
+  }
+
   async function checkAuth(
     email: string,
     password: string,
@@ -698,6 +791,7 @@ export function useHposInterface(): HposInterface {
         method: 'get',
         path: '/config'
       })
+
       return {
         hostPubKey: admin.public_key,
         registrationEmail: admin.email,
@@ -970,7 +1064,9 @@ export function useHposInterface(): HposInterface {
     stopHostingHApp,
     updateHAppHostingPlan,
     getServiceLogs,
-    HPOS_API_URL
+    HPOS_API_URL,
+    getHostingJurisdictions,
+    setHostingJurisdictions
   }
 }
 /* eslint-enable camelcase */
diff --git a/src/pages/HostingPreferences.vue b/src/pages/HostingPreferences.vue
index 68a29c74..3eb2b01d 100644
--- a/src/pages/HostingPreferences.vue
+++ b/src/pages/HostingPreferences.vue
@@ -21,6 +21,7 @@ const isPaidHostingEnabled = ref(userStore.kycLevel !== EUserKycLevel.two)
 
 const pricesSettings = computed(() => preferencesStore.pricesSettings)
 const invoicesSettings = computed(() => preferencesStore.invoicesSettings)
+const hostingJurisdictions = computed(() => preferencesStore.hostingJurisdictions)
 
 const isModalVisible = ref(false)
 
@@ -97,13 +98,13 @@ function updateHostingPlan(): void {
 }
 
 async function invoiceFrequencyChanged({ period, amount }: InvoiceFrequency): Promise<void> {
-  preferencesStore.updateInvoiceFrequency(period, amount);
-  await setDefaultHostPreferences();
+  preferencesStore.updateInvoiceFrequency(period, amount)
+  await setDefaultHostPreferences()
 }
 
 async function invoicePaymentDueChanged({ period }: InvoiceDue): Promise<void> {
-  preferencesStore.updateInvoiceDue(period);
-  await setDefaultHostPreferences();
+  preferencesStore.updateInvoiceDue(period)
+  await setDefaultHostPreferences()
 }
 </script>
 
@@ -145,6 +146,7 @@ async function invoicePaymentDueChanged({ period }: InvoiceDue): Promise<void> {
       />
 
       <HAppSelectionSection
+        :hosting-jurisdictions="hostingJurisdictions"
         class="hosting-preferences__happ-selection"
         data-test-hosting-preferences-happ-selection-section
       />
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index af5c8124..d2e2fe2b 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -1,15 +1,27 @@
 import { defineStore } from 'pinia'
-import { useHposInterface, DefaultPreferencesPayload } from '@/interfaces/HposInterface'
-import { isHostPreferencesResponse } from '@/types/predicates'
-import type { InvoicesData, PricesData } from '@/types/types'
+import {
+  DefaultPreferencesPayload,
+  SetHostingJurisdictionsPayload,
+  useHposInterface
+} from '@/interfaces/HposInterface'
+import { isHostingJurisdictionsResponse, isHostPreferencesResponse } from '@/types/predicates'
+import type { HostingJurisdictions, InvoicesData, PricesData } from '@/types/types'
+import { ECriteriaType } from '@/types/types'
+
+const {
+  getHostPreferences,
+  setDefaultHAppPreferences,
+  getHostingJurisdictions,
+  setHostingJurisdictions
+} = useHposInterface()
 
-const { getHostPreferences, setDefaultHAppPreferences } = useHposInterface()
 const kInitialPrice = 0.0001
 
 interface State {
   isLoaded: boolean
   pricesSettings: PricesData
   invoicesSettings: InvoicesData
+  hostingJurisdictions: HostingJurisdictions
 }
 
 export const usePreferencesStore = defineStore('preferences', {
@@ -28,13 +40,18 @@ export const usePreferencesStore = defineStore('preferences', {
       due: {
         period: 7
       }
+    },
+    hostingJurisdictions: {
+      value: [],
+      criteriaType: ECriteriaType.exclude,
+      timestamp: 0
     }
   }),
 
   actions: {
     async setDefaultPreferences(): Promise<void> {
-      let maxTimeBeforeInvoice = Number(this.invoicesSettings.frequency.period) || 7
-      let invoiceDuePeriod = Number(this.invoicesSettings.due.period) || 7
+      const maxTimeBeforeInvoice = Number(this.invoicesSettings.frequency.period) || 7
+      const invoiceDuePeriod = Number(this.invoicesSettings.due.period) || 7
 
       const payload: DefaultPreferencesPayload = {
         max_fuel_before_invoice: `${this.invoicesSettings.frequency.amount}`,
@@ -79,11 +96,24 @@ export const usePreferencesStore = defineStore('preferences', {
 
     async getHostPreferences(): Promise<void> {
       const response = await getHostPreferences()
+      const hostingJurisdictionsResponse = await getHostingJurisdictions()
 
-      if (!isHostPreferencesResponse(response)) {
+      if (
+        !isHostPreferencesResponse(response) ||
+        !isHostingJurisdictionsResponse(hostingJurisdictionsResponse)
+      ) {
         return
       }
 
+      this.hostingJurisdictions = {
+        value: hostingJurisdictionsResponse.value,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        criteriaType: Object.keys(hostingJurisdictionsResponse.criteria_type).includes('Include')
+          ? ECriteriaType.include
+          : ECriteriaType.exclude,
+        timestamp: hostingJurisdictionsResponse.timestamp
+      }
+
       const {
         max_fuel_before_invoice: invoiceHolofuelThreshold,
         max_time_before_invoice: invoiceDurationThreshold,
@@ -113,16 +143,34 @@ export const usePreferencesStore = defineStore('preferences', {
 
       this.isLoaded = true
     },
+
     updateInvoiceFrequency(invoiceFrequency: number, invoiceMaxHolofuel: number) {
       this.invoicesSettings.frequency = {
         amount: invoiceMaxHolofuel,
         period: invoiceFrequency
       }
     },
+
     updateInvoiceDue(invoiceDueInDays: number) {
       this.invoicesSettings.due = {
         period: invoiceDueInDays
       }
+    },
+
+    async setHostingJurisdictions(payload: SetHostingJurisdictionsPayload) {
+      const result = await setHostingJurisdictions(payload)
+
+      // If the request was successful, update the store
+      if (result) {
+        this.hostingJurisdictions = {
+          value: payload.value,
+          criteriaType: payload.criteria_type,
+          timestamp: Date.now()
+        }
+      } else {
+        // If the request failed, update the timestamp to trigger a re-render of the selects
+        this.hostingJurisdictions.timestamp = Date.now()
+      }
     }
   }
 })
diff --git a/src/types/predicates.ts b/src/types/predicates.ts
index 09f1d952..290fb673 100644
--- a/src/types/predicates.ts
+++ b/src/types/predicates.ts
@@ -1,4 +1,9 @@
-import type { HostPreferencesResponse, Redemption, Transaction } from '@/interfaces/HposInterface'
+import type {
+  HostingJurisdictionsResponse,
+  HostPreferencesResponse,
+  Redemption,
+  Transaction
+} from '@/interfaces/HposInterface'
 import type { AdminSignature, CheckAuthResponse, Error, HoloFuelProfile } from '@/types/types'
 import { EUserKycLevel } from '@/types/types'
 
@@ -19,6 +24,12 @@ export function isHostPreferencesResponse(target: unknown): target is HostPrefer
   return target !== undefined
 }
 
+export function isHostingJurisdictionsResponse(
+  target: unknown
+): target is HostingJurisdictionsResponse {
+  return target !== undefined
+}
+
 export function isNumber(target: unknown): target is number {
   return typeof target === 'number'
 }
diff --git a/src/types/types.ts b/src/types/types.ts
index d0626d71..65532d41 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -117,3 +117,14 @@ export interface EarningsData {
   previous: number
   daily: DailyEarningsData[]
 }
+
+export enum ECriteriaType {
+  include = 'include',
+  exclude = 'exclude'
+}
+
+export interface HostingJurisdictions {
+  value: string[]
+  criteriaType: ECriteriaType
+  timestamp: number
+}

From 1ff5aa48458b7fd6ddecbc2239054ab5d6263d58 Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Thu, 21 Mar 2024 23:42:41 -0500
Subject: [PATCH 2/7] update jurisdiction endpoint & type

---
 src/interfaces/HposInterface.ts | 25 ++++++++++++++-----------
 src/store/preferences.ts        | 24 +++++++++++++-----------
 src/types/predicates.ts         | 10 +++++-----
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index 9e9563f0..a3ff010f 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -123,21 +123,24 @@ export interface HostPreferencesResponse {
   max_time_before_invoice: { secs: number; nanos: number }
   max_fuel_before_invoice: string
   invoice_due_in_days: number
-}
-
-export interface HostingJurisdictionsResponse {
+  jurisdictions: string[]
+  exclude_jurisdictions: boolean
   timestamp: number
-  criteria_type: any
-  value: string[]
 }
 
+// export interface HostingJurisdictionsResponse {
+//   timestamp: number
+//   jurisdictions: string[]
+//   exclude_jurisdictions: boolean
+// }
+
 export interface SetHostingJurisdictionsPayload {
   holoport_id?: string
-  criteria_type: ECriteriaType
-  value: string[]
+  jurisdictions: string[]
+  exclude_jurisdictions: boolean
 }
 
-export interface DefaultPreferencesPayload {
+    export interface DefaultPreferencesPayload {
   price_compute: string
   price_storage: string
   price_bandwidth: string
@@ -162,7 +165,7 @@ type HposHolochainCallResponse =
   | EUserKycLevel
   | ServiceLogsResponse
   | ZomeCallResponse
-  | HostingJurisdictionsResponse
+  // | HostingJurisdictionsResponse
 
 type HposAdminCallResponse = HposConfigResponse
 
@@ -697,8 +700,8 @@ export function useHposInterface(): HposInterface {
     } catch (error) {
       console.error('getHostingJurisdictions encountered an error: ', error)
       return {
-        criteria_type: { Include: null },
-        value: ['Poland'],
+        exclude_jurisdictions: false,
+        jurisdictions: ['Poland'], // QUESTION: shouldn't this be empty if there is an error?
         timestamp: 0
       }
 
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index d2e2fe2b..e7d68770 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -4,7 +4,7 @@ import {
   SetHostingJurisdictionsPayload,
   useHposInterface
 } from '@/interfaces/HposInterface'
-import { isHostingJurisdictionsResponse, isHostPreferencesResponse } from '@/types/predicates'
+import { isHostPreferencesResponse } from '@/types/predicates' // isHostingJurisdictionsResponse, 
 import type { HostingJurisdictions, InvoicesData, PricesData } from '@/types/types'
 import { ECriteriaType } from '@/types/types'
 
@@ -96,22 +96,22 @@ export const usePreferencesStore = defineStore('preferences', {
 
     async getHostPreferences(): Promise<void> {
       const response = await getHostPreferences()
-      const hostingJurisdictionsResponse = await getHostingJurisdictions()
+      // const hostingJurisdictionsResponse = await getHostingJurisdictions()
 
       if (
-        !isHostPreferencesResponse(response) ||
-        !isHostingJurisdictionsResponse(hostingJurisdictionsResponse)
+        !isHostPreferencesResponse(response)  // ||
+        // !isHostingJurisdictionsResponse(hostingJurisdictionsResponse)
       ) {
         return
       }
 
       this.hostingJurisdictions = {
-        value: hostingJurisdictionsResponse.value,
+        value: response.jurisdictions,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        criteriaType: Object.keys(hostingJurisdictionsResponse.criteria_type).includes('Include')
-          ? ECriteriaType.include
-          : ECriteriaType.exclude,
-        timestamp: hostingJurisdictionsResponse.timestamp
+        criteriaType: response.exclude_jurisdictions
+          ? ECriteriaType.exclude
+          : ECriteriaType.include,
+        timestamp: response.timestamp
       }
 
       const {
@@ -163,8 +163,10 @@ export const usePreferencesStore = defineStore('preferences', {
       // If the request was successful, update the store
       if (result) {
         this.hostingJurisdictions = {
-          value: payload.value,
-          criteriaType: payload.criteria_type,
+          value: payload.jurisdictions,
+          criteriaType: payload.exclude_jurisdictions
+          ? ECriteriaType.exclude
+          : ECriteriaType.include,
           timestamp: Date.now()
         }
       } else {
diff --git a/src/types/predicates.ts b/src/types/predicates.ts
index 290fb673..9d536f0f 100644
--- a/src/types/predicates.ts
+++ b/src/types/predicates.ts
@@ -24,11 +24,11 @@ export function isHostPreferencesResponse(target: unknown): target is HostPrefer
   return target !== undefined
 }
 
-export function isHostingJurisdictionsResponse(
-  target: unknown
-): target is HostingJurisdictionsResponse {
-  return target !== undefined
-}
+// export function isHostingJurisdictionsResponse(
+//   target: unknown
+// ): target is HostingJurisdictionsResponse {
+//   return target !== undefined
+// }
 
 export function isNumber(target: unknown): target is number {
   return typeof target === 'number'

From d89469c46788fbaaf02a548406e428d6a5ba4d4e Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Fri, 22 Mar 2024 00:25:44 -0500
Subject: [PATCH 3/7] combine pref and jurisdiction calls

---
 src/interfaces/HposInterface.ts | 7 -------
 src/store/preferences.ts        | 6 ++----
 src/types/predicates.ts         | 7 -------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index a3ff010f..4de269ec 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -128,12 +128,6 @@ export interface HostPreferencesResponse {
   timestamp: number
 }
 
-// export interface HostingJurisdictionsResponse {
-//   timestamp: number
-//   jurisdictions: string[]
-//   exclude_jurisdictions: boolean
-// }
-
 export interface SetHostingJurisdictionsPayload {
   holoport_id?: string
   jurisdictions: string[]
@@ -165,7 +159,6 @@ type HposHolochainCallResponse =
   | EUserKycLevel
   | ServiceLogsResponse
   | ZomeCallResponse
-  // | HostingJurisdictionsResponse
 
 type HposAdminCallResponse = HposConfigResponse
 
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index e7d68770..ebc6813e 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -4,7 +4,7 @@ import {
   SetHostingJurisdictionsPayload,
   useHposInterface
 } from '@/interfaces/HposInterface'
-import { isHostPreferencesResponse } from '@/types/predicates' // isHostingJurisdictionsResponse, 
+import { isHostPreferencesResponse } from '@/types/predicates'
 import type { HostingJurisdictions, InvoicesData, PricesData } from '@/types/types'
 import { ECriteriaType } from '@/types/types'
 
@@ -96,11 +96,9 @@ export const usePreferencesStore = defineStore('preferences', {
 
     async getHostPreferences(): Promise<void> {
       const response = await getHostPreferences()
-      // const hostingJurisdictionsResponse = await getHostingJurisdictions()
 
       if (
-        !isHostPreferencesResponse(response)  // ||
-        // !isHostingJurisdictionsResponse(hostingJurisdictionsResponse)
+        !isHostPreferencesResponse(response)
       ) {
         return
       }
diff --git a/src/types/predicates.ts b/src/types/predicates.ts
index 9d536f0f..a91c4318 100644
--- a/src/types/predicates.ts
+++ b/src/types/predicates.ts
@@ -1,5 +1,4 @@
 import type {
-  HostingJurisdictionsResponse,
   HostPreferencesResponse,
   Redemption,
   Transaction
@@ -24,12 +23,6 @@ export function isHostPreferencesResponse(target: unknown): target is HostPrefer
   return target !== undefined
 }
 
-// export function isHostingJurisdictionsResponse(
-//   target: unknown
-// ): target is HostingJurisdictionsResponse {
-//   return target !== undefined
-// }
-
 export function isNumber(target: unknown): target is number {
   return typeof target === 'number'
 }

From b4e62996818165e0b6b55b40bedffdfe05912b63 Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Fri, 22 Mar 2024 02:45:23 -0500
Subject: [PATCH 4/7] update jurisdiction update functionality, clean

---
 .../modals/GlobalHostingPlanModal.vue         |  8 ++-
 .../HAppSelectionSection.vue                  | 36 ++++---------
 src/interfaces/HposInterface.ts               | 51 ++-----------------
 src/pages/HostingPreferences.vue              | 18 +++++--
 src/store/preferences.ts                      | 35 +++++--------
 5 files changed, 47 insertions(+), 101 deletions(-)

diff --git a/src/components/modals/GlobalHostingPlanModal.vue b/src/components/modals/GlobalHostingPlanModal.vue
index 49df53fe..845d8dec 100644
--- a/src/components/modals/GlobalHostingPlanModal.vue
+++ b/src/components/modals/GlobalHostingPlanModal.vue
@@ -16,7 +16,7 @@ import { HApp, useHposInterface } from '@/interfaces/HposInterface'
 import { useDashboardStore } from '@/store/dashboard'
 import { usePreferencesStore } from '@/store/preferences'
 import { isError as isErrorPredicate } from '@/types/predicates'
-import { EHostingPlan, MappedHApp } from '@/types/types'
+import { EHostingPlan, ECriteriaType, MappedHApp } from '@/types/types'
 
 const { t } = useI18n()
 const dashboardStore = useDashboardStore()
@@ -254,7 +254,11 @@ async function setDefaultHostPreferences(): Promise<void> {
     preferencesStore.updateInvoiceFrequency(7, 1);
     preferencesStore.updateInvoiceDue(7);
     preferencesStore.updateInvoiceFrequency(7, 0);
-    await preferencesStore.setDefaultPreferences()
+    preferencesStore.updateHostingJurisdiction({
+      value: [],
+      criteria_type: ECriteriaType.exclude,
+    });
+    await preferencesStore.setDefaultPreferences();
   } catch (e) {
     isError.value = true
   }
diff --git a/src/components/settings/hostingPreferences/HAppSelectionSection.vue b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
index 1075ec1c..0deb9ac9 100644
--- a/src/components/settings/hostingPreferences/HAppSelectionSection.vue
+++ b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
@@ -4,37 +4,23 @@ import SettingsSection from '../SettingsSection.vue'
 import ExclusionSelect from '@/components/settings/hostingPreferences/ExclusionSelect.vue'
 import { categories } from '@/constants/categories'
 import { countries } from '@/constants/countries'
-import { usePreferencesStore } from '@/store/preferences'
 import type { HostingJurisdictions } from '@/types/types'
 import { ECriteriaType } from '@/types/types'
 
-const preferencesStore = usePreferencesStore()
-
 const props = defineProps<{
   hostingJurisdictions: HostingJurisdictions
+  isJurisdictionLoading: boolean
 }>()
 
-const isJurisdictionExclusionsBusy = ref(false)
 const isHostingCategoriesExclusionsBusy = ref(false)
 
-async function saveHostingJurisdictions(
-  value: string[],
-  criteriaType: ECriteriaType
-): Promise<void> {
-  isJurisdictionExclusionsBusy.value = true
-
-  const payload = {
-    criteria_type: criteriaType,
-    value
-  }
+const emit = defineEmits(['update:jurisdiction'])
 
-  // Make an API call to save new selected options
-  try {
-    await preferencesStore.setHostingJurisdictions(payload)
-    isJurisdictionExclusionsBusy.value = false
-  } catch (error) {
-    isJurisdictionExclusionsBusy.value = false
-  }
+function updateJurisdiction(jurisdiction:  {
+      criteria_type: ECriteriaType
+      value: string[],
+    }): void {
+  emit('update:jurisdiction', jurisdiction)
 }
 
 function saveHostingCategoriesExclusions(): void {
@@ -63,9 +49,9 @@ function saveHostingCategoriesExclusions(): void {
             :key="props.hostingJurisdictions.timestamp"
             label="hosting_preferences.happ_selection.exclude"
             :options="countries"
-            :is-busy="isJurisdictionExclusionsBusy"
+            :is-busy="isJurisdictionLoading"
             :initially-selected="props.hostingJurisdictions.criteriaType === ECriteriaType.exclude ? props.hostingJurisdictions.value : []"
-            @save="saveHostingJurisdictions($event, ECriteriaType.exclude)"
+            @update:value="updateJurisdiction({value: $event, criteria_type: ECriteriaType.exclude})"
           />
         </div>
         <div class="happ-selection-section__tags-item happ-selection-section__tags-item-include">
@@ -73,9 +59,9 @@ function saveHostingCategoriesExclusions(): void {
             :key="props.hostingJurisdictions.timestamp"
             label="hosting_preferences.happ_selection.include"
             :options="countries"
-            :is-busy="isJurisdictionExclusionsBusy"
+            :is-busy="isJurisdictionLoading"
             :initially-selected="props.hostingJurisdictions.criteriaType === 'include' ? props.hostingJurisdictions.value : []"
-            @save="saveHostingJurisdictions($event, ECriteriaType.include)"
+            @update:value="updateJurisdiction({value: $event, criteria_type: ECriteriaType.include})"
           />
         </div>
       </div>
diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index 4de269ec..8c1a0c03 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -34,10 +34,6 @@ interface HposInterface {
   getCoreAppVersion: () => Promise<CoreAppVersion>
   redeemHoloFuel: (payload: RedeemHoloFuelPayload) => Promise<RedemptionTransaction | boolean>
   HPOS_API_URL: string
-  getHostingJurisdictions: () => Promise<HposHolochainCallResponse | { error: unknown }>
-  setHostingJurisdictions: (
-    payload: SetHostingJurisdictionsPayload
-  ) => Promise<HposHolochainCallResponse | { error: unknown }>
 }
 
 interface UpdateHAppHostingPlanPayload {
@@ -128,19 +124,15 @@ export interface HostPreferencesResponse {
   timestamp: number
 }
 
-export interface SetHostingJurisdictionsPayload {
-  holoport_id?: string
-  jurisdictions: string[]
-  exclude_jurisdictions: boolean
-}
-
-    export interface DefaultPreferencesPayload {
+export interface DefaultPreferencesPayload {
   price_compute: string
   price_storage: string
   price_bandwidth: string
   max_time_before_invoice: { secs: number; nanos: number }
   max_fuel_before_invoice: string
   invoice_due_in_days: number
+  jurisdictions: string[]
+  exclude_jurisdictions: boolean
 }
 
 type HposHolochainCallResponse =
@@ -702,41 +694,6 @@ export function useHposInterface(): HposInterface {
     }
   }
 
-  async function setHostingJurisdictions(
-    payload: SetHostingJurisdictionsPayload
-  ): Promise<boolean> {
-    let holoportId = ''
-
-    if (window.location.host.split(':')[0] === 'localhost') {
-      const holoportUrl = `${import.meta.env.VITE_HOLOPORT_URL}` || ''
-      holoportId = holoportUrl.split('//')[1]?.split('.')[0] ?? ''
-    } else {
-      holoportId = window.location.host.split('//')[1]?.split('.')[0] ?? ''
-    }
-
-    try {
-      const params = {
-        appId: localStorage.getItem(kCoreAppVersionLSKey),
-        roleId: 'core-app',
-        zomeName: 'hha',
-        fnName: 'set_hosting_jurisdictions',
-        payload: { holoport_id: holoportId, ...payload }
-      }
-
-      await hposHolochainCall({
-        method: 'post',
-        path: '/zome_call',
-        pathPrefix: '/api/v2',
-        responseType: 'arraybuffer',
-        params
-      })
-
-      return true
-    } catch (error) {
-      return false
-    }
-  }
-
   async function checkAuth(
     email: string,
     password: string,
@@ -1061,8 +1018,6 @@ export function useHposInterface(): HposInterface {
     updateHAppHostingPlan,
     getServiceLogs,
     HPOS_API_URL,
-    getHostingJurisdictions,
-    setHostingJurisdictions
   }
 }
 /* eslint-enable camelcase */
diff --git a/src/pages/HostingPreferences.vue b/src/pages/HostingPreferences.vue
index 3eb2b01d..bc5c6db5 100644
--- a/src/pages/HostingPreferences.vue
+++ b/src/pages/HostingPreferences.vue
@@ -9,7 +9,7 @@ import TogglePaidHostingSection from '@/components/settings/hostingPreferences/T
 import { usePreferencesStore } from '@/store/preferences'
 import { useUserStore } from '@/store/user'
 import type { InvoiceDue, InvoiceFrequency, UpdatePricePayload } from '@/types/types'
-import { EHostingPlan, EUserKycLevel } from '@/types/types'
+import { EHostingPlan, ECriteriaType, EUserKycLevel } from '@/types/types'
 
 const preferencesStore = usePreferencesStore()
 const userStore = useUserStore()
@@ -87,6 +87,14 @@ async function updatePrice({ prop, value }: UpdatePricePayload): Promise<void> {
   await setDefaultHostPreferences()
 }
 
+async function updateHostingJurisdiction(jursidiction: {
+      criteria_type: ECriteriaType
+      value: string[],
+    }): Promise<void> {
+  preferencesStore.updateHostingJurisdiction(jurisdiction)
+  await setDefaultHostPreferences()
+}
+
 function onTogglePaidHosting(isToggledOn: boolean): void {
   isPaidHostingEnabled.value = isToggledOn
 
@@ -146,11 +154,13 @@ async function invoicePaymentDueChanged({ period }: InvoiceDue): Promise<void> {
       />
 
       <HAppSelectionSection
+        :is-jurisdiction-loading="isUpdating"
         :hosting-jurisdictions="hostingJurisdictions"
         class="hosting-preferences__happ-selection"
-        data-test-hosting-preferences-happ-selection-section
-      />
-
+        data-test-hosting-preferences-happ-selection-section        
+        @update:jurisdiction="updateHostingJurisdiction"
+        />
+        
       <GlobalHostingPlanModal
         :key="isPaidHostingEnabled"
         :plan-value="isPaidHostingEnabled ? EHostingPlan.paid : EHostingPlan.free"
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index ebc6813e..58da5244 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import {
   DefaultPreferencesPayload,
-  SetHostingJurisdictionsPayload,
   useHposInterface
 } from '@/interfaces/HposInterface'
 import { isHostPreferencesResponse } from '@/types/predicates'
@@ -11,8 +10,6 @@ import { ECriteriaType } from '@/types/types'
 const {
   getHostPreferences,
   setDefaultHAppPreferences,
-  getHostingJurisdictions,
-  setHostingJurisdictions
 } = useHposInterface()
 
 const kInitialPrice = 0.0001
@@ -62,7 +59,9 @@ export const usePreferencesStore = defineStore('preferences', {
         invoice_due_in_days: invoiceDuePeriod,
         price_compute: `${this.pricesSettings.cpu}`,
         price_storage: `${this.pricesSettings.storage}`,
-        price_bandwidth: `${this.pricesSettings.bandwidth}`
+        price_bandwidth: `${this.pricesSettings.bandwidth}`,
+        jurisdictions: this.hostingJurisdictions.value,
+        exclude_jurisdictions: this.hostingJurisdictions.criteriaType === ECriteriaType.exclude,
       }
 
       await setDefaultHAppPreferences(payload)
@@ -94,12 +93,22 @@ export const usePreferencesStore = defineStore('preferences', {
       }
     },
 
+    updateHostingJurisdiction(jurisdiction: {
+      criteria_type: ECriteriaType
+      value: string[],
+    }): void {
+      this.hostingJurisdictions.value = jurisdiction.value;
+      this.hostingJurisdictions.criteriaType = jurisdiction.criteria_type;
+    },
+
     async getHostPreferences(): Promise<void> {
       const response = await getHostPreferences()
 
       if (
         !isHostPreferencesResponse(response)
       ) {
+        // If the request failed, update the timestamp to trigger a re-render of the selects
+        this.hostingJurisdictions.timestamp = Date.now()
         return
       }
 
@@ -154,23 +163,5 @@ export const usePreferencesStore = defineStore('preferences', {
         period: invoiceDueInDays
       }
     },
-
-    async setHostingJurisdictions(payload: SetHostingJurisdictionsPayload) {
-      const result = await setHostingJurisdictions(payload)
-
-      // If the request was successful, update the store
-      if (result) {
-        this.hostingJurisdictions = {
-          value: payload.jurisdictions,
-          criteriaType: payload.exclude_jurisdictions
-          ? ECriteriaType.exclude
-          : ECriteriaType.include,
-          timestamp: Date.now()
-        }
-      } else {
-        // If the request failed, update the timestamp to trigger a re-render of the selects
-        this.hostingJurisdictions.timestamp = Date.now()
-      }
-    }
   }
 })

From 0c5975b3303d44b56cd5c3f908dc85d5efe72d72 Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Tue, 26 Mar 2024 11:57:34 -0500
Subject: [PATCH 5/7] update type

---
 src/interfaces/HposInterface.ts | 18 ++++++++++++------
 src/store/preferences.ts        | 16 +++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index 8c1a0c03..b1042ba2 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -119,8 +119,10 @@ export interface HostPreferencesResponse {
   max_time_before_invoice: { secs: number; nanos: number }
   max_fuel_before_invoice: string
   invoice_due_in_days: number
-  jurisdictions: string[]
-  exclude_jurisdictions: boolean
+  jurisdiction_prefs: {
+    value: string[],
+    is_exclusion: boolean;
+  }
   timestamp: number
 }
 
@@ -131,8 +133,10 @@ export interface DefaultPreferencesPayload {
   max_time_before_invoice: { secs: number; nanos: number }
   max_fuel_before_invoice: string
   invoice_due_in_days: number
-  jurisdictions: string[]
-  exclude_jurisdictions: boolean
+  jurisdiction_prefs: {
+    value: string[],
+    is_exclusion: boolean;
+  }
 }
 
 type HposHolochainCallResponse =
@@ -685,8 +689,10 @@ export function useHposInterface(): HposInterface {
     } catch (error) {
       console.error('getHostingJurisdictions encountered an error: ', error)
       return {
-        exclude_jurisdictions: false,
-        jurisdictions: ['Poland'], // QUESTION: shouldn't this be empty if there is an error?
+        jurisdiction_prefs: {
+          value: ['Poland'], // QUESTION: shouldn't this be empty if there is an error?
+          is_exclusion: false,
+        },
         timestamp: 0
       }
 
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index 58da5244..185c5052 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -51,17 +51,19 @@ export const usePreferencesStore = defineStore('preferences', {
       const invoiceDuePeriod = Number(this.invoicesSettings.due.period) || 7
 
       const payload: DefaultPreferencesPayload = {
+        price_compute: `${this.pricesSettings.cpu}`,
+        price_storage: `${this.pricesSettings.storage}`,
+        price_bandwidth: `${this.pricesSettings.bandwidth}`,
         max_fuel_before_invoice: `${this.invoicesSettings.frequency.amount}`,
         max_time_before_invoice: {
           secs: maxTimeBeforeInvoice * 24 * 60 * 60,
           nanos: 0
         },
         invoice_due_in_days: invoiceDuePeriod,
-        price_compute: `${this.pricesSettings.cpu}`,
-        price_storage: `${this.pricesSettings.storage}`,
-        price_bandwidth: `${this.pricesSettings.bandwidth}`,
-        jurisdictions: this.hostingJurisdictions.value,
-        exclude_jurisdictions: this.hostingJurisdictions.criteriaType === ECriteriaType.exclude,
+        jurisdiction_prefs: {
+          value: this.hostingJurisdictions.value,
+          is_exclusion: this.hostingJurisdictions.criteriaType === ECriteriaType.exclude,
+        }
       }
 
       await setDefaultHAppPreferences(payload)
@@ -113,9 +115,9 @@ export const usePreferencesStore = defineStore('preferences', {
       }
 
       this.hostingJurisdictions = {
-        value: response.jurisdictions,
+        value: response.jurisdiction_prefs.value || [],
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        criteriaType: response.exclude_jurisdictions
+        criteriaType: response.jurisdiction_prefs.is_exclusion
           ? ECriteriaType.exclude
           : ECriteriaType.include,
         timestamp: response.timestamp

From 9adb6b69b3b67f0a31528d363fe8efac965daf85 Mon Sep 17 00:00:00 2001
From: Mateusz Rybczonek <>
Date: Thu, 4 Apr 2024 10:02:19 +0200
Subject: [PATCH 6/7] feat: update ui to make the zome_call

---
 .../HAppSelectionSection.vue                  | 15 ++++++----
 src/interfaces/HposInterface.ts               | 14 +++++-----
 src/pages/HostingPreferences.vue              | 17 ++++++-----
 src/store/preferences.ts                      | 28 +++++++------------
 4 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/components/settings/hostingPreferences/HAppSelectionSection.vue b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
index 0deb9ac9..02c763f5 100644
--- a/src/components/settings/hostingPreferences/HAppSelectionSection.vue
+++ b/src/components/settings/hostingPreferences/HAppSelectionSection.vue
@@ -16,10 +16,13 @@ const isHostingCategoriesExclusionsBusy = ref(false)
 
 const emit = defineEmits(['update:jurisdiction'])
 
-function updateJurisdiction(jurisdiction:  {
-      criteria_type: ECriteriaType
-      value: string[],
-    }): void {
+interface Jurisdiction {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  criteria_type: ECriteriaType
+  value: string[]
+}
+
+function updateJurisdiction(jurisdiction: Jurisdiction): void {
   emit('update:jurisdiction', jurisdiction)
 }
 
@@ -51,7 +54,7 @@ function saveHostingCategoriesExclusions(): void {
             :options="countries"
             :is-busy="isJurisdictionLoading"
             :initially-selected="props.hostingJurisdictions.criteriaType === ECriteriaType.exclude ? props.hostingJurisdictions.value : []"
-            @update:value="updateJurisdiction({value: $event, criteria_type: ECriteriaType.exclude})"
+            @save="updateJurisdiction({value: $event, criteria_type: ECriteriaType.exclude})"
           />
         </div>
         <div class="happ-selection-section__tags-item happ-selection-section__tags-item-include">
@@ -61,7 +64,7 @@ function saveHostingCategoriesExclusions(): void {
             :options="countries"
             :is-busy="isJurisdictionLoading"
             :initially-selected="props.hostingJurisdictions.criteriaType === 'include' ? props.hostingJurisdictions.value : []"
-            @update:value="updateJurisdiction({value: $event, criteria_type: ECriteriaType.include})"
+            @save="updateJurisdiction({value: $event, criteria_type: ECriteriaType.include})"
           />
         </div>
       </div>
diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index b1042ba2..3528a8a4 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -120,8 +120,8 @@ export interface HostPreferencesResponse {
   max_fuel_before_invoice: string
   invoice_due_in_days: number
   jurisdiction_prefs: {
-    value: string[],
-    is_exclusion: boolean;
+    value: string[]
+    is_exclusion: boolean
   }
   timestamp: number
 }
@@ -134,8 +134,8 @@ export interface DefaultPreferencesPayload {
   max_fuel_before_invoice: string
   invoice_due_in_days: number
   jurisdiction_prefs: {
-    value: string[],
-    is_exclusion: boolean;
+    value: string[]
+    is_exclusion: boolean
   }
 }
 
@@ -658,7 +658,7 @@ export function useHposInterface(): HposInterface {
 
   async function getHostingJurisdictions(): Promise<
     HposHolochainCallResponse | { error: unknown }
-    > {
+  > {
     let holoportId = ''
 
     if (window.location.host.split(':')[0] === 'localhost') {
@@ -691,7 +691,7 @@ export function useHposInterface(): HposInterface {
       return {
         jurisdiction_prefs: {
           value: ['Poland'], // QUESTION: shouldn't this be empty if there is an error?
-          is_exclusion: false,
+          is_exclusion: false
         },
         timestamp: 0
       }
@@ -1023,7 +1023,7 @@ export function useHposInterface(): HposInterface {
     stopHostingHApp,
     updateHAppHostingPlan,
     getServiceLogs,
-    HPOS_API_URL,
+    HPOS_API_URL
   }
 }
 /* eslint-enable camelcase */
diff --git a/src/pages/HostingPreferences.vue b/src/pages/HostingPreferences.vue
index bc5c6db5..c28e60ef 100644
--- a/src/pages/HostingPreferences.vue
+++ b/src/pages/HostingPreferences.vue
@@ -87,10 +87,13 @@ async function updatePrice({ prop, value }: UpdatePricePayload): Promise<void> {
   await setDefaultHostPreferences()
 }
 
-async function updateHostingJurisdiction(jursidiction: {
-      criteria_type: ECriteriaType
-      value: string[],
-    }): Promise<void> {
+interface HostingJurisdiction {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  criteria_type: ECriteriaType
+  value: string[]
+}
+
+async function updateHostingJurisdiction(jurisdiction: HostingJurisdiction): Promise<void> {
   preferencesStore.updateHostingJurisdiction(jurisdiction)
   await setDefaultHostPreferences()
 }
@@ -157,10 +160,10 @@ async function invoicePaymentDueChanged({ period }: InvoiceDue): Promise<void> {
         :is-jurisdiction-loading="isUpdating"
         :hosting-jurisdictions="hostingJurisdictions"
         class="hosting-preferences__happ-selection"
-        data-test-hosting-preferences-happ-selection-section        
+        data-test-hosting-preferences-happ-selection-section
         @update:jurisdiction="updateHostingJurisdiction"
-        />
-        
+      />
+
       <GlobalHostingPlanModal
         :key="isPaidHostingEnabled"
         :plan-value="isPaidHostingEnabled ? EHostingPlan.paid : EHostingPlan.free"
diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index 185c5052..c8397f18 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -1,16 +1,10 @@
 import { defineStore } from 'pinia'
-import {
-  DefaultPreferencesPayload,
-  useHposInterface
-} from '@/interfaces/HposInterface'
+import { DefaultPreferencesPayload, useHposInterface } from '@/interfaces/HposInterface'
 import { isHostPreferencesResponse } from '@/types/predicates'
 import type { HostingJurisdictions, InvoicesData, PricesData } from '@/types/types'
 import { ECriteriaType } from '@/types/types'
 
-const {
-  getHostPreferences,
-  setDefaultHAppPreferences,
-} = useHposInterface()
+const { getHostPreferences, setDefaultHAppPreferences } = useHposInterface()
 
 const kInitialPrice = 0.0001
 
@@ -62,7 +56,7 @@ export const usePreferencesStore = defineStore('preferences', {
         invoice_due_in_days: invoiceDuePeriod,
         jurisdiction_prefs: {
           value: this.hostingJurisdictions.value,
-          is_exclusion: this.hostingJurisdictions.criteriaType === ECriteriaType.exclude,
+          is_exclusion: this.hostingJurisdictions.criteriaType === ECriteriaType.exclude
         }
       }
 
@@ -97,27 +91,25 @@ export const usePreferencesStore = defineStore('preferences', {
 
     updateHostingJurisdiction(jurisdiction: {
       criteria_type: ECriteriaType
-      value: string[],
+      value: string[]
     }): void {
-      this.hostingJurisdictions.value = jurisdiction.value;
-      this.hostingJurisdictions.criteriaType = jurisdiction.criteria_type;
+      this.hostingJurisdictions.value = jurisdiction.value
+      this.hostingJurisdictions.criteriaType = jurisdiction.criteria_type
     },
 
     async getHostPreferences(): Promise<void> {
       const response = await getHostPreferences()
 
-      if (
-        !isHostPreferencesResponse(response)
-      ) {
+      if (!isHostPreferencesResponse(response)) {
         // If the request failed, update the timestamp to trigger a re-render of the selects
         this.hostingJurisdictions.timestamp = Date.now()
         return
       }
 
       this.hostingJurisdictions = {
-        value: response.jurisdiction_prefs.value || [],
+        value: response.jurisdiction_prefs?.value || [],
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        criteriaType: response.jurisdiction_prefs.is_exclusion
+        criteriaType: response.jurisdiction_prefs?.is_exclusion
           ? ECriteriaType.exclude
           : ECriteriaType.include,
         timestamp: response.timestamp
@@ -164,6 +156,6 @@ export const usePreferencesStore = defineStore('preferences', {
       this.invoicesSettings.due = {
         period: invoiceDueInDays
       }
-    },
+    }
   }
 })

From e56a6a481f443ec91dbab9619c226faa906d4d8d Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Tue, 9 Apr 2024 06:31:19 -0500
Subject: [PATCH 7/7] avoid u64 overflow

---
 src/store/preferences.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/store/preferences.ts b/src/store/preferences.ts
index c8397f18..ab1b5f2f 100644
--- a/src/store/preferences.ts
+++ b/src/store/preferences.ts
@@ -41,8 +41,15 @@ export const usePreferencesStore = defineStore('preferences', {
 
   actions: {
     async setDefaultPreferences(): Promise<void> {
-      const maxTimeBeforeInvoice = Number(this.invoicesSettings.frequency.period) || 7
+      const maxDaysBeforeInvoice = Number(this.invoicesSettings.frequency.period) || 7
       const invoiceDuePeriod = Number(this.invoicesSettings.due.period) || 7
+      let maxTimeBeforeInvoice = maxDaysBeforeInvoice * 24 * 60 * 60
+
+      // NB: 18446744073709551615 is the max u64 number, which is the required type for `max_time_before_invoice.secs`
+      // Number should never need to exceed this amount.
+      if (maxTimeBeforeInvoice > 18446744073709551615) {
+        maxTimeBeforeInvoice = 18446744073709551615
+      } 
 
       const payload: DefaultPreferencesPayload = {
         price_compute: `${this.pricesSettings.cpu}`,
@@ -50,8 +57,8 @@ export const usePreferencesStore = defineStore('preferences', {
         price_bandwidth: `${this.pricesSettings.bandwidth}`,
         max_fuel_before_invoice: `${this.invoicesSettings.frequency.amount}`,
         max_time_before_invoice: {
-          secs: maxTimeBeforeInvoice * 24 * 60 * 60,
-          nanos: 0
+          secs: maxTimeBeforeInvoice,
+          nanos: 0,
         },
         invoice_due_in_days: invoiceDuePeriod,
         jurisdiction_prefs: {