From 0376bf177eb66ad9e2ea530b4ca1adb614f8673a Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Tue, 5 Sep 2023 18:43:27 -0600
Subject: [PATCH 01/16] feat(step-payout): add custom input for default tier

---
 src/const.js                              |  2 +
 src/pages/proposals/create/StepPayout.vue | 66 +++++++++++++++--------
 src/pages/proposals/create/config.js      |  5 ++
 src/store/proposals/index.js              | 16 +++---
 4 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/src/const.js b/src/const.js
index b00dbaeff..bb2d171aa 100644
--- a/src/const.js
+++ b/src/const.js
@@ -88,3 +88,5 @@ export const PERIOD_NUMBERS = Object.freeze({
   SECS_PER_YEAR: 31557600,
   CYCLE_DURATION_SEC: 2629800
 })
+
+export const DEFAULT_TIER = 'Custom Reward'
diff --git a/src/pages/proposals/create/StepPayout.vue b/src/pages/proposals/create/StepPayout.vue
index d2984beb1..f959a4552 100644
--- a/src/pages/proposals/create/StepPayout.vue
+++ b/src/pages/proposals/create/StepPayout.vue
@@ -1,12 +1,12 @@
 <script>
 import { mapGetters } from 'vuex'
-import { validation } from '~/mixins/validation'
+import { DEFAULT_TIER, PROPOSAL_TYPE } from '~/const'
 import { format } from '~/mixins/format'
-import { PROPOSAL_TYPE } from '~/const'
+import { validation } from '~/mixins/validation'
 
 export default {
   name: 'step-payout',
-  mixins: [validation, format],
+  mixins: [format, validation],
   components: {
     InfoTooltip: () => import('~/components/common/info-tooltip.vue'),
     PayoutAmounts: () => import('~/components/common/payout-amounts.vue'),
@@ -54,10 +54,20 @@ export default {
     usdAmount: {
       immediate: true,
       handler () {
+        console.log('usdAmount')
         this.calculateTokens()
       }
     },
 
+    annualUsdSalary: {
+      deep: true,
+      immediate: true,
+      handler () {
+        // console.log('annualUsdSalary')
+        // setTimeout(() => { this.calculateTokens() }, 33)
+      }
+    },
+
     deferred: {
       immediate: true,
       handler () {
@@ -67,6 +77,7 @@ export default {
         }
       }
     },
+
     commitment: {
       immediate: true,
       handler () {
@@ -75,7 +86,7 @@ export default {
           this.firstPaintCommitment = false
         }
       }
-    },
+    }
 
     // '$store.state.proposals.draft.type': {
     //   immediate: true,
@@ -84,20 +95,29 @@ export default {
     //   }
     // },
 
-    '$store.state.proposals.draft.annualUsdSalary': {
-      immediate: true,
-      handler (val) {
-        if (!this.custom) {
-          if (val === 0) {
-            this.salaryOption = null
-          }
-          this.calculateTokens()
-        }
-      }
-    }
+    // '$store.state.proposals.draft.annualUsdSalary': {
+    //   immediate: true,
+    //   handler (val) {
+    //     if (!this.custom) {
+    //       if (val === 0) {
+    //         this.salaryOption = null
+    //       }
+    //       this.calculateTokens()
+    //     }
+    //   }
+    // }
   },
 
   mounted () {
+    // if (!this.pegCoefficientLabel) {
+    //   this.$store.commit('proposals/setPegCoefficientLabel', 0)
+    //   this.$store.commit('proposals/setPegCoefficient', this.calculateCoefficient(0))
+    // }
+
+    // if (this.isDefaultTier) {
+    //   this.custom = true
+    // }
+
     if (!this.daoSettings.cashClaimsEnabled && this.isContribution) {
       this.deferred = 100
     }
@@ -294,14 +314,9 @@ export default {
     isContribution () {
       const proposalType = this.$store.state.proposals.draft.category.key
       return proposalType === 'contribution'
-    }
+    },
+    isDefaultTier () { return this.$store.state.proposals.draft.tier.value.name === DEFAULT_TIER }
   },
-  // mounted () {
-  //   if (!this.pegCoefficientLabel) {
-  //     this.$store.commit('proposals/setPegCoefficientLabel', 0)
-  //     this.$store.commit('proposals/setPegCoefficient', this.calculateCoefficient(0))
-  //   }
-  // },
 
   methods: {
     isValidCommitment (commitment) {
@@ -353,6 +368,13 @@ widget(:class="{ 'disable-step': currentStepName !== 'step-payout' && $q.screen.
     .text-body2.text-grey-7(v-if="fields.stepCompensationTitle && fields.stepCompensationTitle.description") {{ fields.stepCompensationTitle.description }}
   .text-body2.text-grey-7.q-mb-xl(v-if="$q.screen.lt.md || $q.screen.md") {{ $t('pages.proposals.create.steppayout.pleaseEnterTheUsd') }}
   .q-col-gutter-sm(:class="{ 'row':$q.screen.gt.md, 'q-mt-xl':$q.screen.gt.md }")
+    .col(v-if="isDefaultTier" :class="{ 'q-mb-xxl':$q.screen.lt.md || $q.screen.md }")
+      label.h-label {{ fields.annualUsdSalaryCustom.label }}
+      .text-body2.text-grey-7.q-my-md(v-if="fields.annualUsdSalaryCustom.description") {{ fields.annualUsdSalaryCustom.description }}
+      .row.full-width.items-center.q-mt-xs
+        q-avatar.q-mr-xs(size="40px")
+          img(src="~assets/icons/usd.svg")
+        q-input.rounded-border.col(:disable="custom" dense outlined rounded suffix="$" type="number" v-model="annualUsdSalary" :placeholder="$t('pages.proposals.create.steppayout.typeTheAmountOfUsd')")
     .col(v-if="fields.usdAmount" :class="{ 'q-mb-xxl':$q.screen.lt.md || $q.screen.md }")
       label.h-label {{ fields.usdAmount.label }}
       .text-body2.text-grey-7.q-my-md(v-if="fields.usdAmount.description") {{ fields.usdAmount.description }}
diff --git a/src/pages/proposals/create/config.js b/src/pages/proposals/create/config.js
index 4ec76c056..d395befca 100644
--- a/src/pages/proposals/create/config.js
+++ b/src/pages/proposals/create/config.js
@@ -535,6 +535,11 @@ export default {
               label: I18n.t('proposal-creation.manageYourSalary'),
               description: I18n.t('proposal-creation.fieldsBelowDisplayTheMinimum')
             },
+            annualUsdSalaryCustom: {
+              key: 'annualUsdSalaryCustom',
+              label: I18n.t('proposal-creation.totalUSDEquivalent'),
+              type: 'asset'
+            },
             commitment: {
               key: 'commitment',
               label: I18n.t('proposal-creation.chooseYourCommitmentLevel'),
diff --git a/src/store/proposals/index.js b/src/store/proposals/index.js
index 42aa6016b..acbaae7fd 100644
--- a/src/store/proposals/index.js
+++ b/src/store/proposals/index.js
@@ -1,5 +1,5 @@
 import Storage from '~/localStorage/storage'
-import { PROPOSAL_TYPE, PERIOD_NUMBERS } from '~/const'
+import { PROPOSAL_TYPE, PERIOD_NUMBERS, DEFAULT_TIER } from '~/const'
 /**
  * This vuex data store contains the data needed in the proposal creation wizard.
  */
@@ -514,11 +514,15 @@ export default {
                 { label: 'description', value: ['string', draft.description] },
                 { label: 'url', value: ['string', draft.url] },
 
-                { label: 'salary_band_id', value: ['int64', draft.tier.value.id] },
-                // TODO: if salary_band_id is not present these are required
-                // { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
-                // { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
-                // { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] },
+                ...(draft.tier.value.name !== DEFAULT_TIER
+                  ? [
+                      { label: 'salary_band_id', value: ['int64', draft.tier.value.id] }
+                    ]
+                  : [
+                      { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
+                      { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
+                      { label: 'min_deferred_x100', value: ['int64', Math.round(parseFloat(draft.minDeferred))] }
+                    ]),
 
                 { label: 'time_share_x100', value: ['int64', draft.commitment] },
                 { label: 'deferred_perc_x100', value: ['int64', draft.deferred] },

From 49c6d71ad15bb7dee314e823207592ac0d81d9da Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Tue, 5 Sep 2023 18:49:53 -0600
Subject: [PATCH 02/16] refactor: clean up

---
 src/pages/proposals/create/StepPayout.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/proposals/create/StepPayout.vue b/src/pages/proposals/create/StepPayout.vue
index f959a4552..064791fbe 100644
--- a/src/pages/proposals/create/StepPayout.vue
+++ b/src/pages/proposals/create/StepPayout.vue
@@ -54,7 +54,6 @@ export default {
     usdAmount: {
       immediate: true,
       handler () {
-        console.log('usdAmount')
         this.calculateTokens()
       }
     },
@@ -63,8 +62,7 @@ export default {
       deep: true,
       immediate: true,
       handler () {
-        // console.log('annualUsdSalary')
-        // setTimeout(() => { this.calculateTokens() }, 33)
+        this.calculateTokens()
       }
     },
 

From be63af8a5ec3cdf80cbebd4b37008c25103ca0c4 Mon Sep 17 00:00:00 2001
From: Evgeni B <evgeni.biryuk.hypha@gmail.com>
Date: Wed, 6 Sep 2023 16:02:06 +0300
Subject: [PATCH 03/16] fix(register): need help button link (#DEV-913) (#2418)

---
 src/components/login/register-user-with-captcha-view.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/login/register-user-with-captcha-view.vue b/src/components/login/register-user-with-captcha-view.vue
index 45001f53e..5f9750174 100644
--- a/src/components/login/register-user-with-captcha-view.vue
+++ b/src/components/login/register-user-with-captcha-view.vue
@@ -6,6 +6,8 @@ import ipfsy from '~/utils/ipfsy'
 import { Notify } from 'quasar'
 import slugify from '~/utils/slugify'
 
+const HELP_LINK = 'https://help.hypha.earth/hc/2431449449'
+
 export default {
   name: 'register-user-with-captcha-view',
   mixins: [validation],
@@ -50,6 +52,7 @@ export default {
       }
     }
     return {
+      HELP_LINK: HELP_LINK,
       stepIndex: {
         captcha: 1,
         inviteLink: 2,
@@ -205,6 +208,9 @@ export default {
           ]
         })
       }
+    },
+    goToDocumentation() {
+      window.location.href = this.HELP_LINK
     }
   }
 }
@@ -265,7 +271,7 @@ export default {
                     .text-bold.text-black.q-mt-md {{ $t('login.register-user-with-captcha-view.signYourFirstTransaction') }}
                     p.text-normal.q-mt-xs {{ $t('login.register-user-with-captcha-view.didYouCreate') }}
                     .row.flex.justify-center.items-center.q-mt-xl
-                    .text-primary.text-bold.cursor-pointer(@click="next") {{ $t('login.register-user-with-captcha-view.needHelp') }}
+                    .text-primary.text-bold.cursor-pointer(@click="goToDocumentation()") {{ $t('login.register-user-with-captcha-view.needHelp') }}
         #form4.flex.column.justify-between.no-wrap.full-height(v-show="step === this.steps.create.name")
           div.full-height.column.justify-end
             .font-lato.text-heading.text-weight-bolder(:style="{ 'font-size': '34px' }") {{ $t('login.register-user-with-captcha-view.createYourDao') }}

From 182a5048b86db6b0e6ef531b7b4ebd22ea44cc3b Mon Sep 17 00:00:00 2001
From: Evgeni B <evgeni.biryuk.hypha@gmail.com>
Date: Wed, 6 Sep 2023 16:02:50 +0300
Subject: [PATCH 04/16] fix(proposal): edit badge requrring assignments
 (#DEV-917) (#2417)

---
 src/pages/proposals/ProposalDetail.vue     |  4 ++--
 src/pages/proposals/create/StepDetails.vue |  4 ++--
 src/store/proposals/index.js               | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue
index 676ffb8a7..7a32507ae 100644
--- a/src/pages/proposals/ProposalDetail.vue
+++ b/src/pages/proposals/ProposalDetail.vue
@@ -1336,8 +1336,8 @@ export default {
         // this.$store.commit('proposals/setMinDeferred', this.proposal?.role[0]?.details_minDeferredX100_i)
       }
 
-      if (this.proposal.__typename === PROPOSAL_TYPE.ABILITY) { // Badge Assignment
-        this.$store.commit('proposals/setBadge', this?.proposal.badge)
+      if (this.proposal.__typename === PROPOSAL_TYPE.ABILITY || this.proposal.__typename === PROPOSAL_TYPE.ASSIGNBADGE) { // Badge Assignment
+        this.$store.commit('proposals/setBadge', this?.proposal.badge?.[0])
         this.$store.commit('proposals/setStartPeriod', this.proposal?.start[0])
         this.$store.commit('proposals/setPeriodCount', this.proposal?.details_periodCount_i)
       }
diff --git a/src/pages/proposals/create/StepDetails.vue b/src/pages/proposals/create/StepDetails.vue
index 3d38c7cd5..ba55f10e6 100644
--- a/src/pages/proposals/create/StepDetails.vue
+++ b/src/pages/proposals/create/StepDetails.vue
@@ -160,10 +160,10 @@ widget
   section.q-mt-xl
     .col.q-mt-sm(v-if="fields.title")
       label.h-label {{ fields.title.label }}
-      q-input.q-mt-xs.rounded-border(:disable="isEditing || isProposalType(PROPOSAL_TYPE.ABILITY)" :placeholder="fields.title.placeholder" :rules="[val => !!val || $t('pages.proposals.create.stepdetails.titleIsRequired'), val => (val.length <= TITLE_MAX_LENGTH) || $t('pages.proposals.create.stepdetails.proposalTitleLengthHasToBeLess', { TITLE_MAX_LENGTH: TITLE_MAX_LENGTH, length: title.length })]" dense outlined v-model="title")
+      q-input.q-mt-xs.rounded-border(:disable="isEditing || isProposalType(PROPOSAL_TYPE.ABILITY) || isProposalType(PROPOSAL_TYPE.ASSIGNBADGE)" :placeholder="fields.title.placeholder" :rules="[val => !!val || $t('pages.proposals.create.stepdetails.titleIsRequired'), val => (val.length <= TITLE_MAX_LENGTH) || $t('pages.proposals.create.stepdetails.proposalTitleLengthHasToBeLess', { TITLE_MAX_LENGTH: TITLE_MAX_LENGTH, length: title.length })]" dense outlined v-model="title")
     .col.q-mt-sm(v-if="fields.description")
       label.h-label {{ fields.description.label }}
-      q-field.q-mt-xs.rounded-border(:rules="[rules.required, val => this.$sanitize(val, { allowedTags: [] }).length < DESCRIPTION_MAX_LENGTH || $t('pages.proposals.create.stepdetails.theDescriptionMustContainLess', { DESCRIPTION_MAX_LENGTH: DESCRIPTION_MAX_LENGTH, length: this.$sanitize(description, { allowedTags: [] }).length })]" dense maxlength="4000" outlined ref="bio" stack-label v-model="description" :disable="isProposalType(PROPOSAL_TYPE.ABILITY)")
+      q-field.q-mt-xs.rounded-border(:rules="[rules.required, val => this.$sanitize(val, { allowedTags: [] }).length < DESCRIPTION_MAX_LENGTH || $t('pages.proposals.create.stepdetails.theDescriptionMustContainLess', { DESCRIPTION_MAX_LENGTH: DESCRIPTION_MAX_LENGTH, length: this.$sanitize(description, { allowedTags: [] }).length })]" dense maxlength="4000" outlined ref="bio" stack-label v-model="description" :disable="isProposalType(PROPOSAL_TYPE.ABILITY) || isProposalType(PROPOSAL_TYPE.ASSIGNBADGE)")
         input-editor.full-width(:placeholder="fields.description.placeholder" :toolbar="[['bold', 'italic', /*'strike', 'underline'*/],['token', 'hr', 'link', 'custom_btn'],['quote', 'unordered', 'ordered']]" flat ref="editorRef" v-model="description")
     .col.q-mt-sm(v-if="fields.circle")
       label.h-label {{ fields.circle.label }}
diff --git a/src/store/proposals/index.js b/src/store/proposals/index.js
index 42aa6016b..cda89b963 100644
--- a/src/store/proposals/index.js
+++ b/src/store/proposals/index.js
@@ -744,6 +744,18 @@ export default {
             ]
             break
 
+          case PROPOSAL_TYPE.ASSIGNBADGE:
+            content = [
+              { label: 'content_group_label', value: ['string', 'details'] },
+              { label: 'assignee', value: ['name', rootState.accounts.account] },
+              { label: 'title', value: ['string', draft.title] },
+              { label: 'description', value: ['string', draft.description] },
+              { label: 'badge', value: ['int64', draft.badge.docId] },
+              { label: 'start_period', value: ['int64', draft.startPeriod.docId] },
+              { label: 'period_count', value: ['int64', draft.periodCount] }
+            ]
+            break
+
           case PROPOSAL_TYPE.ARCHETYPE:
             content = [
               { label: 'content_group_label', value: ['string', 'details'] },

From 5532a94e2652d9ca48d08a91f0856206b5f7b925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:18:29 -0600
Subject: [PATCH 05/16] feat(dho-selector): add retry strategy for dao query
 (#2421)

---
 src/layouts/DhoSelector.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/layouts/DhoSelector.vue b/src/layouts/DhoSelector.vue
index 8b127a2f4..6caa23721 100644
--- a/src/layouts/DhoSelector.vue
+++ b/src/layouts/DhoSelector.vue
@@ -1,6 +1,8 @@
 <script>
 import gql from 'graphql-tag'
 
+const MAX_NUM_OF_RETIRES = 10
+
 const DAO_ACTIVE_QUERY = `
 
   queryDao @cascade(fields: ["settings"]) {
@@ -321,8 +323,14 @@ export default {
 
       result (res) {
         const data = res.data?.queryDao
+
         if (!(data.length)) {
-          this.$router.push({ path: '/not-found' })
+          this.daoQueryNumberOfRetires++
+          if (this.daoQueryNumberOfRetires > MAX_NUM_OF_RETIRES) {
+            this.$router.push({ path: '/not-found' })
+          } else {
+            this.$apollo.queries.dao.refetch()
+          }
         }
 
         this.$store.dispatch('accounts/checkMembership')
@@ -362,6 +370,12 @@ export default {
 
   },
 
+  data () {
+    return {
+      daoQueryNumberOfRetires: 0
+    }
+  },
+
   computed: {
     daoRegexp () { return '/^' + this.dhoname + '$/i' },
 

From fbdd8e9b1042a5cc5acb0a3516f97b90c9835648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:18:49 -0600
Subject: [PATCH 06/16] fix(custom-period-input): parse initial period
 correctly (DEV-847) (#2423)

---
 src/components/form/custom-period-input.vue | 25 ++++++++++++++++-----
 src/locales/en.json                         |  2 ++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/form/custom-period-input.vue b/src/components/form/custom-period-input.vue
index ced79791c..6a687b989 100644
--- a/src/components/form/custom-period-input.vue
+++ b/src/components/form/custom-period-input.vue
@@ -7,6 +7,7 @@ const secondsToInterval = (seconds) => {
 
   let period = ''
 
+  const minutes = Math.floor(seconds / 60)
   const hours = Math.floor(seconds / 3600)
   const days = Math.floor(seconds / 86400)
   const weeks = Math.floor(seconds / 604800)
@@ -20,16 +21,18 @@ const secondsToInterval = (seconds) => {
     period = 'days'
   } else if (hours > 0) {
     period = 'hours'
+  } else if (minutes > 0) {
+    period = 'minutes'
   }
 
-  return { period, months, weeks, days, hours }
+  return { period, months, weeks, days, hours, minutes }
 }
 
 export default {
   name: 'custom-period-input',
   data () {
     return {
-      period: 'days'
+      period: ''
     }
   },
 
@@ -51,6 +54,7 @@ export default {
       },
       set (value) {
         if (this.type === 'time' && this.period !== '') {
+          if (this.period === 'minutes') { value = (value * 60) }
           if (this.period === 'hours') { value = (value * 60) * 60 }
           if (this.period === 'days') { value = value * 24 * 60 * 60 }
           if (this.period === 'weeks') { value = value * 7 * 24 * 60 * 60 }
@@ -65,8 +69,15 @@ export default {
     label  () { return this.$t(`periods.${this.period}`) }
   },
 
-  mounted () {
-    this.period = secondsToInterval(this.value).period
+  watch: {
+    value: {
+      handler: function (value) {
+        if (value && !this.period) {
+          this.period = secondsToInterval(this.value).period
+        }
+      },
+      immediate: true
+    }
   }
 
 }
@@ -87,7 +98,11 @@ div.custom-period-input
     .col-6
       q-btn-dropdown.full-width(:disable="disable" :label="label" outline no-caps rounded unelevated)
         q-list
-          q-item(clickable v-close-popup @click="period = 'hours'")
+          q-item(clickable v-close-popup @click="period = 'minutes'")
+            q-item-section
+              q-item-label {{ $t('periods.minutes') }}
+
+          q-item(clickable v-close-popup @click="period = 'minutes'")
             q-item-section
               q-item-label {{ $t('periods.hours') }}
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 6a90a4d04..8a2b2c816 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -3,6 +3,8 @@
     "delete": "Delete"
   },
   "periods": {
+    "minute": "Minute",
+    "minutes": "Minutes",
     "hour": "Hour",
     "hours": "Hours",
     "day": "Day",

From 3aad7ff29e19b9c8ff0d5195241971b7f4ce8fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:19:51 -0600
Subject: [PATCH 07/16] refactor(accounts-actions): swap selectedDao with
 rootState.dao (#2419)

---
 src/store/accounts/actions.js | 59 +++++++++++++++--------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/store/accounts/actions.js b/src/store/accounts/actions.js
index 3136423f8..5ac170a9e 100644
--- a/src/store/accounts/actions.js
+++ b/src/store/accounts/actions.js
@@ -151,7 +151,7 @@ export const sendOTP = async function ({ commit }, form) {
   }
 }
 
-export const verifyOTP = async function ({ commit, dispatch, state }, { smsOtp, smsNumber, telosAccount, publicKey, privateKey, reason }) {
+export const verifyOTP = async function ({ commit, dispatch, state, rootState }, { smsOtp, smsNumber, telosAccount, publicKey, privateKey, reason }) {
   const { error } = await this.$accountApi.post('/v1/accounts', {
     smsOtp,
     smsNumber,
@@ -186,7 +186,6 @@ export const verifyOTP = async function ({ commit, dispatch, state }, { smsOtp,
 
   const actions = []
 
-  const selectedDao = this.getters['dao/selectedDao']
   actions.push({
     account: this.$config.contracts.dao,
     name: 'apply',
@@ -197,7 +196,7 @@ export const verifyOTP = async function ({ commit, dispatch, state }, { smsOtp,
     data: {
       applicant: telosAccount,
       content: reason,
-      dao_id: selectedDao.docId
+      dao_id: rootState.dao.docId
     }
   })
 
@@ -209,18 +208,17 @@ export const verifyOTP = async function ({ commit, dispatch, state }, { smsOtp,
 }
 
 export const applyMember = async function ({ state, rootState, commit }, { content }) {
-  const actions = []
-  const selectedDao = this.getters['dao/selectedDao']
-
-  actions.push({
-    account: this.$config.contracts.dao,
-    name: 'apply',
-    data: {
-      applicant: rootState.accounts.account,
-      dao_id: selectedDao.docId,
-      content
+  const actions = [
+    {
+      account: this.$config.contracts.dao,
+      name: 'apply',
+      data: {
+        applicant: rootState.accounts.account,
+        dao_id: rootState.dao.docId,
+        content
+      }
     }
-  })
+  ]
 
   const result = await this.$api.signTransaction(actions)
   if (result) {
@@ -230,13 +228,12 @@ export const applyMember = async function ({ state, rootState, commit }, { conte
 }
 
 export const removeApplicant = async function ({ commit, rootState }, { applicant }) {
-  const selectedDao = this.getters['dao/selectedDao']
   const actions = [{
     account: this.$config.contracts.dao,
     name: 'remapplicant',
     data: {
       applicant_names: [applicant],
-      dao_id: selectedDao.docId
+      dao_id: rootState.dao.docId
     }
   }]
   const result = await this.$api.signTransaction(actions)
@@ -244,15 +241,13 @@ export const removeApplicant = async function ({ commit, rootState }, { applican
 }
 
 export const enrollMember = async function ({ commit, rootState }, { applicant, content }) {
-  const selectedDao = this.getters['dao/selectedDao']
-
   const actions = [{
     account: this.$config.contracts.dao,
     name: 'enroll',
     data: {
       enroller: rootState.accounts.account,
       applicant,
-      dao_id: selectedDao.docId,
+      dao_id: rootState.dao.docId,
       content
     }
   }]
@@ -260,20 +255,19 @@ export const enrollMember = async function ({ commit, rootState }, { applicant,
   return result
 }
 
-export const checkMembership = async function ({ commit, state, dispatch }) {
-  const selectedDao = this.getters['dao/selectedDao']
-  if (!selectedDao.docId) return
+export const checkMembership = async function ({ commit, state, dispatch, rootState }) {
+  if (!rootState.dao.docId) return
   const [memberResponse, applicantResponse] = await Promise.all([this.$apollo.query({
     query: require('~/query/account/dao-member.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   }),
   this.$apollo.query({
     query: require('~/query/account/dao-applicant.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   })])
@@ -290,20 +284,18 @@ export const checkMembership = async function ({ commit, state, dispatch }) {
   }
 }
 
-export const checkPermissions = async function ({ commit, state }) {
-  const selectedDao = this.getters['dao/selectedDao']
-
+export const checkPermissions = async function ({ commit, state, rootState }) {
   const [adminResponse, enrollerResponse] = await Promise.all([this.$apollo.query({
     query: require('~/query/account/dao-admin.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   }),
   this.$apollo.query({
     query: require('~/query/account/dao-enroller.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   })])
@@ -314,20 +306,19 @@ export const checkPermissions = async function ({ commit, state }) {
   commit('setEnroller', isEnroller)
 }
 
-export const checkMemberType = async function ({ commit, state }) {
-  const selectedDao = this.getters['dao/selectedDao']
-  if (!selectedDao.docId) return
+export const checkMemberType = async function ({ commit, state, rootState }) {
+  if (!rootState.dao.docId) return
   const [coreResponse, communityResponse] = await Promise.all([this.$apollo.query({
     query: require('~/query/account/dao-core-member.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   }),
   this.$apollo.query({
     query: require('~/query/account/dao-community-member.gql'),
     variables: {
-      daoId: selectedDao.docId,
+      daoId: rootState.dao.docId,
       username: state.account
     }
   })])

From 4cd3c7bb84099cc1b9dd05db8bba8ffcb228626a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:20:07 -0600
Subject: [PATCH 08/16] fix(step-duration): remove ability to unselect a date
 (#2420)

---
 src/pages/proposals/create/StepDuration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/proposals/create/StepDuration.vue b/src/pages/proposals/create/StepDuration.vue
index 2adcf3566..93c6579d9 100644
--- a/src/pages/proposals/create/StepDuration.vue
+++ b/src/pages/proposals/create/StepDuration.vue
@@ -243,7 +243,7 @@ widget
           q-input.rounded-border.col.q-mt-xs(dense outlined rounded v-model="startValue")
             template(v-slot:append)
               q-icon(size="xs" name="fa fa-calendar-alt")
-          q-date.bg-internal-bg.calendar.absolute.z-top(:options="datePickerOptions" minimal="minimal" ref="calendar" v-model="startValue" rounded)
+          q-date.bg-internal-bg.calendar.absolute.z-top(no-unset :options="datePickerOptions" minimal="minimal" ref="calendar" v-model="startValue" rounded)
         .col
           label.h-h7 {{ $t('pages.proposals.create.stepduration.periods') }}
           q-input.rounded-border.col.q-mt-xs(dense outlined rounded v-model="periodCount")

From 0a9dce5bb1e1f6fd28e0673ab23b2cd5edb58968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:27:51 -0600
Subject: [PATCH 09/16] feat: add invite member link (#2406)

* feat: add invite member link

* refactor: post review clean up
---
 .github/workflows/deploy-dev.yml       |   3 +
 .github/workflows/deploy-eos-dev.yml   |   3 +
 .github/workflows/deploy-eos-prod.yml  |   3 +
 .github/workflows/deploy-prod.yml      |   3 +
 .github/workflows/deploy-staging.yml   |   2 +
 quasar.conf.js                         |   4 +-
 src/boot/config.js                     |  11 +--
 src/components/navigation/dho-card.vue |   2 +-
 src/components/navigation/dho-info.vue |   2 +-
 src/locales/en.json                    |   4 +
 src/pages/dho/Members.vue              | 104 +++++++++++++++++++------
 src/pages/onboarding/create.vue        |   2 +-
 src/store/dao/actions.js               |  46 ++++++++++-
 src/utils/generateRandomString.js      |   8 ++
 src/utils/generateSecret.js            |  26 +++++++
 15 files changed, 187 insertions(+), 36 deletions(-)
 create mode 100644 src/utils/generateRandomString.js
 create mode 100644 src/utils/generateSecret.js

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index a6ba0ace0..653a39f01 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -59,6 +59,9 @@ jobs:
           CAPTCHA_HOST: ${{ vars.CAPTCHA_HOST }}
           CAPTCHA_NETWORK: ${{ vars.CAPTCHA_NETWORK }}
           LOGIN_CONTRACT: ${{ vars.LOGIN_CONTRACT }}
+          JOIN_CONTRACT: ${{ vars.JOIN_CONTRACT }}
+          JOIN_URI: 'https://join.hypha.earth/'
+
 
       - name: S3 sync
         uses: jakejarvis/s3-sync-action@master
diff --git a/.github/workflows/deploy-eos-dev.yml b/.github/workflows/deploy-eos-dev.yml
index 38ad602d2..ec39fc326 100644
--- a/.github/workflows/deploy-eos-dev.yml
+++ b/.github/workflows/deploy-eos-dev.yml
@@ -74,6 +74,9 @@ jobs:
           CAPTCHA_NETWORK: ${{ vars.CAPTCHA_NETWORK }}
           LOGIN_CONTRACT: ${{ vars.LOGIN_CONTRACT }}
 
+          JOIN_CONTRACT: ${{ vars.JOIN_CONTRACT }}
+          JOIN_URI: 'https://join.hypha.earth/'
+
       - name: Deploy to S3 bucket
         run: aws s3 sync ./dist/spa s3://${{ vars.AWS_S3_BUCKET}} --delete
       - name: Invalidate CloudFront
diff --git a/.github/workflows/deploy-eos-prod.yml b/.github/workflows/deploy-eos-prod.yml
index e137842a1..2c8ee5a86 100644
--- a/.github/workflows/deploy-eos-prod.yml
+++ b/.github/workflows/deploy-eos-prod.yml
@@ -74,6 +74,9 @@ jobs:
           CAPTCHA_NETWORK: ${{ vars.CAPTCHA_NETWORK }}
           LOGIN_CONTRACT: ${{ vars.LOGIN_CONTRACT }}
 
+          JOIN_CONTRACT: ${{ vars.JOIN_CONTRACT }}
+          JOIN_URI: 'https://join.hypha.earth/'
+
       - name: Deploy to S3 bucket
         run: aws s3 sync ./dist/spa s3://${{ vars.AWS_S3_BUCKET}} --delete
       - name: Invalidate CloudFront
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index 7e7424bdb..6e1188605 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -64,6 +64,9 @@ jobs:
           CAPTCHA_NETWORK: ${{ vars.CAPTCHA_NETWORK }}
           LOGIN_CONTRACT: ${{ vars.LOGIN_CONTRACT }}
 
+          JOIN_CONTRACT: ${{ vars.JOIN_CONTRACT }}
+          JOIN_URI: 'https://join.hypha.earth/'
+
       - name: S3 sync
         uses: jakejarvis/s3-sync-action@master
         with:
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index 5ca9902bb..fef1be5f2 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -64,6 +64,8 @@ jobs:
           CAPTCHA_HOST: ${{ vars.CAPTCHA_HOST }}
           CAPTCHA_NETWORK: ${{ vars.CAPTCHA_NETWORK }}
           LOGIN_CONTRACT: ${{ vars.LOGIN_CONTRACT }}
+          JOIN_CONTRACT: ${{ vars.JOIN_CONTRACT }}
+          JOIN_URI: 'https://join.hypha.earth/'
 
       - name: S3 sync
         uses: jakejarvis/s3-sync-action@master
diff --git a/quasar.conf.js b/quasar.conf.js
index d6c015147..9ae07f330 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -107,7 +107,9 @@ module.exports = function (ctx) {
         CAPTCHA_PUBLIC_KEY: process.env.CAPTCHA_PUBLIC_KEY,
         CAPTCHA_HOST: process.env.CAPTCHA_HOST,
         CAPTCHA_NETWORK: process.env.CAPTCHA_NETWORK || 'telosTestnet',
-        LOGIN_CONTRACT: process.env.LOGIN_CONTRACT
+        LOGIN_CONTRACT: process.env.LOGIN_CONTRACT,
+        JOIN_CONTRACT: process.env.JOIN_CONTRACT,
+        JOIN_URI: process.env.JOIN_URI
       },
 
       scopeHoisting: true,
diff --git a/src/boot/config.js b/src/boot/config.js
index d7b25f3c4..1ebed139d 100644
--- a/src/boot/config.js
+++ b/src/boot/config.js
@@ -3,13 +3,14 @@ export default async ({ Vue, store }) => {
     const contracts = {
       dao: process.env.DAO_CONTRACT,
       decide: process.env.DECIDE_CONTRACT,
-      hyphaToken: process.env.SUPPLY_CONTRACT,
+      hvoiceToken: process.env.HVOICE_TOKEN_CONTRACT,
       hypha: process.env.HYPHA_CONTRACT,
-      seedsToken: process.env.SEEDS_TOKEN_CONTRACT,
-      seedsEscrow: process.env.SEEDS_ESCROW_CONTRACT,
-      tlostoSeeds: process.env.TLOSTO_SEEDS,
+      hyphaToken: process.env.SUPPLY_CONTRACT,
+      join: process.env.JOIN_CONTRACT,
       kv: process.env.KV_CONTRACT,
-      hvoiceToken: process.env.HVOICE_TOKEN_CONTRACT
+      seedsEscrow: process.env.SEEDS_ESCROW_CONTRACT,
+      seedsToken: process.env.SEEDS_TOKEN_CONTRACT,
+      tlostoSeeds: process.env.TLOSTO_SEEDS
     }
 
     Vue.prototype.$config = {
diff --git a/src/components/navigation/dho-card.vue b/src/components/navigation/dho-card.vue
index 07c9fe0a1..b253f267a 100644
--- a/src/components/navigation/dho-card.vue
+++ b/src/components/navigation/dho-card.vue
@@ -37,7 +37,7 @@ export default {
         this.$q.notify({
           color: 'secondary',
           textColor: 'white',
-          message: 'The link has been copied',
+          message: this.$('messages.linkCopied'),
           icon: 'far fa-copy',
           timeout: 5000,
           actions: [{ icon: 'fas fa-times', color: 'white' }]
diff --git a/src/components/navigation/dho-info.vue b/src/components/navigation/dho-info.vue
index cc1925ea7..57b2b2f02 100644
--- a/src/components/navigation/dho-info.vue
+++ b/src/components/navigation/dho-info.vue
@@ -55,7 +55,7 @@ export default {
         this.$q.notify({
           color: 'secondary',
           textColor: 'white',
-          message: 'The link has been copied',
+          message: this.$('messages.linkCopied'),
           icon: 'far fa-copy',
           timeout: 5000,
           actions: [{ icon: 'fas fa-times', color: 'white' }]
diff --git a/src/locales/en.json b/src/locales/en.json
index 8a2b2c816..02c409681 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2,6 +2,9 @@
   "actions": {
     "delete": "Delete"
   },
+  "messages": {
+    "linkCopied":"The link has been copied"
+  },
   "periods": {
     "minute": "Minute",
     "minutes": "Minutes",
@@ -1429,6 +1432,7 @@
         "daoApplicants1": "Applicants",
         "filterByAccountName": "Filter by account name",
         "sortBy": "Sort by",
+        "copy": "Copy",
         "joinDateDescending": "Join date descending",
         "joinDateAscending": "Join date ascending",
         "alphabetically": "Alphabetically (A-Z)",
diff --git a/src/pages/dho/Members.vue b/src/pages/dho/Members.vue
index 0a712bfe3..cf3a233c8 100644
--- a/src/pages/dho/Members.vue
+++ b/src/pages/dho/Members.vue
@@ -54,6 +54,12 @@ const DAO_CORE_MEMBERS_QUERY = `
 
 `
 
+const STATES = Object.freeze({
+  WAITING: 'WAITING',
+  CREATING_LINK: 'CREATING_LINK',
+  CREATED_LINK: 'CREATED_LINK'
+})
+
 export default {
   name: 'page-members',
   mixins: [documents],
@@ -62,6 +68,7 @@ export default {
     FilterOpenButton: () => import('~/components/filters/filter-open-button.vue'),
     FilterWidget: () => import('~/components/filters/filter-widget.vue'),
     FilterWidgetMobile: () => import('~/components/filters/filter-widget-mobile.vue'),
+    LoadingSpinner: () => import('~/components/common/loading-spinner.vue'),
     MembersList: () => import('~/components/profiles/members-list.vue'),
     ProfileCard: () => import('~/components/profiles/profile-card.vue'),
     UpvoteDelegateWidget: () => import('~/components/common/upvote-delegate-widget.vue'),
@@ -70,6 +77,11 @@ export default {
 
   data () {
     return {
+      STATES,
+      state: STATES.WAITING,
+
+      inviteURL: process.env.JOIN_URI,
+
       applicantsCount: 0,
       applicantsPagination: {
         fetchMore: true,
@@ -295,8 +307,14 @@ export default {
 
     filterObject () { return this.textFilter ? { details_member_n: { regexp: `/${this.textFilter}/i` } } : null },
     memberTypeFilter () { return this.filters.filter(_ => _.enabled).map(_ => _.value) },
-    showCommunityMembers () { return this.memberTypeFilter.includes('ALL') || this.memberTypeFilter.includes('COMMUNITY') },
-    showCoreMembers () { return this.memberTypeFilter.includes('ALL') || this.memberTypeFilter.includes('CORE') }
+    showCommunityMembers () { return this.memberTypeFilter.includes(MEMBER_TYPE.ALL) || this.memberTypeFilter.includes(MEMBER_TYPE.COMMUNITY) },
+    showCoreMembers () { return this.memberTypeFilter.includes(MEMBER_TYPE.ALL) || this.memberTypeFilter.includes(MEMBER_TYPE.CORE) },
+    isInviteModalOpen () {
+      return [
+        STATES.CREATING_LINK,
+        STATES.CREATED_LINK
+      ].includes(this.state)
+    }
   },
 
   mounted () {
@@ -309,6 +327,43 @@ export default {
 
   methods: {
     ...mapActions('accounts', ['applyMember']),
+    ...mapActions('dao', ['createInviteLink']),
+
+    async _createInviteLink () {
+      try {
+        this.state = STATES.CREATING_LINK
+        const invite = await this.createInviteLink()
+        const url = new URL(process.env.JOIN_URI)
+
+        Object.keys(invite).forEach(key => {
+          url.searchParams.set(key, invite[key])
+        })
+
+        this.inviteURL = url.toString()
+        this.state = STATES.CREATED_LINK
+      } catch (e) {
+        const message = e.message || e.cause.message
+        this.showNotification({ message, color: 'red' })
+      }
+    },
+
+    async _copyToClipBoard () {
+      try {
+        await copyToClipboard(this.inviteURL)
+        this.showNotification({
+          message: this.$('messages.linkCopied'),
+          color: 'secondary',
+          icon: 'far fa-copy'
+        })
+      } catch (error) {
+        this.showNotification({
+          message: 'Error',
+          textColor: 'white',
+          color: 'negative',
+          icon: 'far fa-copy'
+        })
+      }
+    },
 
     pollData () {
       setTimeout(() => {
@@ -378,27 +433,6 @@ export default {
       this.applicantsPagination.fetchMore = this.showApplicants
     },
 
-    async copyToClipBoard () {
-      try {
-        const resolved = this.$router.resolve({ name: 'login', params: { dhoname: this.daoSettings.url } })
-        const host = window.location.host
-        const url = `${host}${resolved.href}`
-        await copyToClipboard(url)
-        this.showNotification({
-          message: 'The link has been copied',
-          color: 'secondary',
-          icon: 'far fa-copy'
-        })
-      } catch (error) {
-        this.showNotification({
-          message: 'Error',
-          textColor: 'white',
-          color: 'negative',
-          icon: 'far fa-copy'
-        })
-      }
-    },
-
     onChange (name, value) { this.$set(this, name, value) },
 
     hasLastResult () { return this.$apollo.queries.daoApplicants.observer?.lastResult },
@@ -476,14 +510,34 @@ q-page.page-members
   base-banner(:compact="!$q.screen.gt.sm" :split="$q.screen.gt.md" v-bind="banner" v-if="isMembersBannerVisible")
     template(v-slot:buttons)
       nav.row.items-center
-        .row.inline.q-pr-md(v-if="!isMember && !isApplicant && account && !loadingAccount")
+        .row.inline.q-pr-md(v-if="!isMember && !isApplicant && account")
           q-btn.q-px-lg.h-btn1(:disable="!daoSettings.registrationEnabled" @click="onApply" color="secondary" :label="$t('pages.dho.members.becomeAMember')" no-caps="no-caps" rounded text-color="white" unelevated="unelevated")
           q-tooltip(v-if="!daoSettings.registrationEnabled") {{ $t('pages.dho.members.registrationIsTemporarilyDisabled') }}
-        q-btn.q-px-lg.h-btn1(:flat="!account" @click="copyToClipBoard" color="secondary" :label="$t('pages.dho.members.copyInviteLink')" no-caps="no-caps" rounded text-color="white" unelevated="unelevated")
+        q-btn.q-px-lg.h-btn1(:flat="!account" @click="_createInviteLink" color="secondary" :label="$t('pages.dho.members.copyInviteLink')" no-caps="no-caps" rounded text-color="white" unelevated="unelevated")
           q-tooltip {{ $t('pages.dho.members.sendALink') }}
 
   //- upvote-delegate-widget(endDate="2023-05-29" :users="tempUsersForVotes")
 
+  q-dialog(:value="isInviteModalOpen")
+    .row.justify-center.items-center
+      div.q-pa-xl(v-if="state === STATES.CREATING_LINK")
+        loading-spinner(color="primary" size="72px")
+      div.bg-white.rounded-full.q-pa-xl(v-if="state === STATES.CREATED_LINK" :style="{'min-width': '480px'}")
+        header
+          h3.q-pa-none.q-ma-none.h-h4.text-weight-700 {{ $t('pages.dho.members.copyInviteLink') }}
+        section.q-mt-xl
+          .row.full-width.q-my-xs.relative-position
+            q-input.full-width(dense disable filled rounded v-model='inviteURL')
+            q-btn.q-px-lg.absolute-right(
+              :label="$t('pages.dho.members.copy')"
+              @click="_copyToClipBoard"
+              color="secondary"
+              no-caps="no-caps"
+              rounded
+              text-color="white"
+              unelevated="unelevated"
+            )
+
   .row.q-py-md
     div.col-9(:class="{'full-width': $q.screen.lt.md}")
 
diff --git a/src/pages/onboarding/create.vue b/src/pages/onboarding/create.vue
index 7f8e0fd95..4f9544a27 100644
--- a/src/pages/onboarding/create.vue
+++ b/src/pages/onboarding/create.vue
@@ -375,7 +375,7 @@ export default {
         this.$q.notify({
           color: 'secondary',
           textColor: 'white',
-          message: 'The link has been copied',
+          message: this.$('messages.linkCopied'),
           icon: 'far fa-copy',
           timeout: 1000,
           actions: [{ icon: 'fas fa-times', color: 'white' }]
diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js
index ba03020e7..4524cb609 100644
--- a/src/store/dao/actions.js
+++ b/src/store/dao/actions.js
@@ -1,9 +1,13 @@
 /* eslint-disable no-unreachable */
-import camelToSnakeCase from '~/utils/camelToSnakeCase'
 import HyphaTokensSaleUtil from '@hypha-dao/hypha-token-sales-util'
 import { JsonRpc } from 'eosjs'
 import { RPC_ACCOUNTS } from '~/const'
 
+import camelToSnakeCase from '~/utils/camelToSnakeCase'
+import generateRandomString from '~/utils/generateRandomString'
+import generateSecret from '~/utils/generateSecret'
+import ipfsy from '~/utils/ipfsy'
+
 export const createDAO = async function (context, { data, isDraft }) {
   const actions = [{
     account: this.$config.contracts.dao,
@@ -1003,6 +1007,44 @@ export const deleteCircle = async function ({ state, rootState }, id) {
   return this.$api.signTransaction(actions)
 }
 
+export const createInviteLink = async function ({ state, rootState }, id) {
+  const CHAIN = process.env.CAPTCHA_NETWORK // telos | telosTestnet | eos | eosTestnet
+  const DAO_ID = rootState.dao.docId
+  const INVITE_CODE = generateRandomString(10)
+  const ENROLL_SECRET = await generateSecret()
+
+  const PAYLOAD = `https://hypha.earth/invite?code=${INVITE_CODE}&chain=${CHAIN}&dao=${DAO_ID}&enroll_secret=${ENROLL_SECRET.secret}`
+  const url = `https://hyphawallet.page.link/?link=${encodeURIComponent(PAYLOAD)}&apn=earth.hypha.wallet.hypha_wallet&isi=1659926348&ibi=earth.hypha.wallet.hyphaWallet&cid=866980350130875998&_osl=https://hyphawallet.page.link/KPo2&_icp=1`
+  const inviter = rootState.profiles.profiles[rootState.accounts.account].publicData
+
+  const actions = [
+    {
+      account: this.$config.contracts.join,
+      name: 'createinvite',
+      data: {
+        dao_id: rootState.dao.docId,
+        dao_name: rootState.dao.settings.settings_daoName_n,
+        dao_fullname: rootState.dao.settings.settings_daoTitle_s,
+        inviter: rootState.accounts.account,
+        hashed_secret: ENROLL_SECRET.hashedSecret
+      }
+    }
+  ]
+
+  await this.$api.signTransaction(actions)
+
+  return {
+    url,
+    daoName: rootState.dao.settings.title,
+    daoDescription: rootState.dao.settings.description,
+    daoLogo: ipfsy(rootState.dao.settings.logo),
+    coreMemberCount: rootState.dao.meta.memberCount,
+    communityMemberCount: 0,
+    inviterName: inviter.name,
+    inviterAvatar: inviter.avatar
+  }
+}
+
 export const createTokens = async function ({ state, rootState }, data) {
   const actions = [
     {
@@ -1042,5 +1084,5 @@ export const createTokens = async function ({ state, rootState }, data) {
     }
   ]
 
-  return this.$api.signTransaction(actions)
+  await this.$api.signTransaction(actions)
 }
diff --git a/src/utils/generateRandomString.js b/src/utils/generateRandomString.js
new file mode 100644
index 000000000..9461edf59
--- /dev/null
+++ b/src/utils/generateRandomString.js
@@ -0,0 +1,8 @@
+export default function generateRandomString(length) {
+  const charset = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
+  let retVal = ''
+  for (let i = 0, n = charset.length; i < length; ++i) {
+    retVal += charset.charAt(Math.floor(Math.random() * n)).toUpperCase()
+  }
+  return retVal
+}
diff --git a/src/utils/generateSecret.js b/src/utils/generateSecret.js
new file mode 100644
index 000000000..afe71ee31
--- /dev/null
+++ b/src/utils/generateSecret.js
@@ -0,0 +1,26 @@
+const ecc = require('eosjs-ecc')
+const sha256 = ecc.sha256
+
+export default async function generateSecret () {
+  // Generate a random secret (32 bytes)
+  const secret = new Uint8Array(32)
+  window.crypto.getRandomValues(secret)
+
+  // Convert the secret to a checksum256 string
+  const secretChecksum256 = await sha256(Buffer.from(secret))
+
+  // Hash the secret using SHA256
+  // Note: sha256 needs to be called on a byte buffer so we take our secret and convert it
+  // back to a byte buffer, then hash that.
+  const hashedSecret = sha256(Buffer.from(secretChecksum256, 'hex'))
+
+  // verify here:
+  // https://emn178.github.io/online-tools/sha256.html - set input type to "hex"
+  // console.log('Generated Secret:', secretChecksum256)
+  // console.log('Hashed Secret:', hashedSecret)
+
+  return {
+    secret: secretChecksum256,
+    hashedSecret
+  }
+}

From 6ccf8d43ca0410652d1b0fea8926758c5a65821d Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Thu, 7 Sep 2023 08:29:55 -0600
Subject: [PATCH 10/16] refactor(step-payout): removed commented code

---
 src/pages/proposals/create/StepPayout.vue | 72 ++++++-----------------
 1 file changed, 17 insertions(+), 55 deletions(-)

diff --git a/src/pages/proposals/create/StepPayout.vue b/src/pages/proposals/create/StepPayout.vue
index 064791fbe..84a16474c 100644
--- a/src/pages/proposals/create/StepPayout.vue
+++ b/src/pages/proposals/create/StepPayout.vue
@@ -1,12 +1,12 @@
 <script>
 import { mapGetters } from 'vuex'
-import { DEFAULT_TIER, PROPOSAL_TYPE } from '~/const'
-import { format } from '~/mixins/format'
 import { validation } from '~/mixins/validation'
+import { format } from '~/mixins/format'
+import { PROPOSAL_TYPE } from '~/const'
 
 export default {
   name: 'step-payout',
-  mixins: [format, validation],
+  mixins: [validation, format],
   components: {
     InfoTooltip: () => import('~/components/common/info-tooltip.vue'),
     PayoutAmounts: () => import('~/components/common/payout-amounts.vue'),
@@ -58,14 +58,6 @@ export default {
       }
     },
 
-    annualUsdSalary: {
-      deep: true,
-      immediate: true,
-      handler () {
-        this.calculateTokens()
-      }
-    },
-
     deferred: {
       immediate: true,
       handler () {
@@ -75,7 +67,6 @@ export default {
         }
       }
     },
-
     commitment: {
       immediate: true,
       handler () {
@@ -84,38 +75,22 @@ export default {
           this.firstPaintCommitment = false
         }
       }
-    }
+    },
 
-    // '$store.state.proposals.draft.type': {
-    //   immediate: true,
-    //   handler () {
-    //     this.custom = false
-    //   }
-    // },
-
-    // '$store.state.proposals.draft.annualUsdSalary': {
-    //   immediate: true,
-    //   handler (val) {
-    //     if (!this.custom) {
-    //       if (val === 0) {
-    //         this.salaryOption = null
-    //       }
-    //       this.calculateTokens()
-    //     }
-    //   }
-    // }
+    '$store.state.proposals.draft.annualUsdSalary': {
+      immediate: true,
+      handler (val) {
+        if (!this.custom) {
+          if (val === 0) {
+            this.salaryOption = null
+          }
+          this.calculateTokens()
+        }
+      }
+    }
   },
 
   mounted () {
-    // if (!this.pegCoefficientLabel) {
-    //   this.$store.commit('proposals/setPegCoefficientLabel', 0)
-    //   this.$store.commit('proposals/setPegCoefficient', this.calculateCoefficient(0))
-    // }
-
-    // if (this.isDefaultTier) {
-    //   this.custom = true
-    // }
-
     if (!this.daoSettings.cashClaimsEnabled && this.isContribution) {
       this.deferred = 100
     }
@@ -142,11 +117,7 @@ export default {
       } else if (proposalType === 'contribution' && (!this.usdAmount || this.usdAmount <= 0) && !this.custom) {
         return true
       }
-      // if (!this.usdAmount && this.$store.state.proposals.draft.category.key !== 'assignment') {
-      //   return true
-      // } else if (!this.annualUsdSalary && this.$store.state.proposals.draft.category.key !== 'archetype') {
-      //   return true
-      // }
+
       return false
     },
 
@@ -312,8 +283,7 @@ export default {
     isContribution () {
       const proposalType = this.$store.state.proposals.draft.category.key
       return proposalType === 'contribution'
-    },
-    isDefaultTier () { return this.$store.state.proposals.draft.tier.value.name === DEFAULT_TIER }
+    }
   },
 
   methods: {
@@ -351,7 +321,6 @@ export default {
     },
 
     calculateCoefficient (coefficient) {
-      // if (!coefficient || coefficient === 0) return 0
       return ((coefficient * 100) + 10000)
     }
   }
@@ -366,13 +335,6 @@ widget(:class="{ 'disable-step': currentStepName !== 'step-payout' && $q.screen.
     .text-body2.text-grey-7(v-if="fields.stepCompensationTitle && fields.stepCompensationTitle.description") {{ fields.stepCompensationTitle.description }}
   .text-body2.text-grey-7.q-mb-xl(v-if="$q.screen.lt.md || $q.screen.md") {{ $t('pages.proposals.create.steppayout.pleaseEnterTheUsd') }}
   .q-col-gutter-sm(:class="{ 'row':$q.screen.gt.md, 'q-mt-xl':$q.screen.gt.md }")
-    .col(v-if="isDefaultTier" :class="{ 'q-mb-xxl':$q.screen.lt.md || $q.screen.md }")
-      label.h-label {{ fields.annualUsdSalaryCustom.label }}
-      .text-body2.text-grey-7.q-my-md(v-if="fields.annualUsdSalaryCustom.description") {{ fields.annualUsdSalaryCustom.description }}
-      .row.full-width.items-center.q-mt-xs
-        q-avatar.q-mr-xs(size="40px")
-          img(src="~assets/icons/usd.svg")
-        q-input.rounded-border.col(:disable="custom" dense outlined rounded suffix="$" type="number" v-model="annualUsdSalary" :placeholder="$t('pages.proposals.create.steppayout.typeTheAmountOfUsd')")
     .col(v-if="fields.usdAmount" :class="{ 'q-mb-xxl':$q.screen.lt.md || $q.screen.md }")
       label.h-label {{ fields.usdAmount.label }}
       .text-body2.text-grey-7.q-my-md(v-if="fields.usdAmount.description") {{ fields.usdAmount.description }}

From 6dda1211acddbef5310ad985a05f6868c8ae8d66 Mon Sep 17 00:00:00 2001
From: Evgeni B <evgeni.biryuk.hypha@gmail.com>
Date: Fri, 8 Sep 2023 17:59:06 +0300
Subject: [PATCH 11/16] fix(proposal-creation): links in the proposal creation
 (#DEV-846) (#2424)

---
 src/components/proposals/proposal-view.vue   |  5 ++-
 src/components/proposals/version-history.vue | 42 ++++++++++----------
 src/pages/proposals/create/StepReview.vue    |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/components/proposals/proposal-view.vue b/src/components/proposals/proposal-view.vue
index 447f473d2..0652e98f0 100644
--- a/src/components/proposals/proposal-view.vue
+++ b/src/components/proposals/proposal-view.vue
@@ -78,7 +78,8 @@ export default {
     parentQuest: Object,
     votingMethod: String,
     circle: Object,
-    parentCircle: Array
+    parentCircle: Array,
+    hidePolicyHistory: Boolean
   },
   data () {
     return {
@@ -213,7 +214,7 @@ widget.proposal-view.q-mb-sm
     .column
       .text-h5.text-bold {{ title }}
       .text-italic.text-body {{ subtitle }}
-  version-history(v-if="type === PROPOSAL_TYPE.POLICY" :proposalId="proposal?.docId ? proposal.docId : docId")
+  version-history(v-if="type === PROPOSAL_TYPE.POLICY && !hidePolicyHistory" :proposalId="proposal?.docId ? proposal.docId : docId")
   quest-progression(v-if="type === PROPOSAL_TYPE.QUEST_START" :proposalId="proposal?.docId ? proposal.docId : docId")
   .q-my-sm(:class="{ 'row':$q.screen.gt.md }" v-if="type === PROPOSAL_TYPE.ROLE || type === PROPOSAL_TYPE.EDIT || type === PROPOSAL_TYPE.PAYOUT || type === PROPOSAL_TYPE.ABILITY || type === PROPOSAL_TYPE.BADGE")
     .col.bg-internal-bg.rounded-border(:class="{ 'q-mr-xs':$q.screen.gt.md, 'q-mb-sm':$q.screen.lt.md || $q.screen.md }" v-if="icon")
diff --git a/src/components/proposals/version-history.vue b/src/components/proposals/version-history.vue
index 270b57264..0915dbfa5 100644
--- a/src/components/proposals/version-history.vue
+++ b/src/components/proposals/version-history.vue
@@ -25,7 +25,7 @@ export default {
         return {
           state: policy.details_state_s,
           originalApprovedDate: policy.system_originalApprovedDate_t,
-          masterpolicy: policy.masterpolicy
+          masterpolicy: policy?.masterpolicy
         }
       },
       skip () { return !this.selectedDao?.docId || !this.proposalId },
@@ -43,29 +43,29 @@ export default {
 }
 </script>
 <template lang="pug">
-.version-history(v-if="versionHistory.state !== PROPOSAL_STATE.DRAFTED")
+.version-history(v-if="versionHistory?.state !== PROPOSAL_STATE.DRAFTED")
   .text-grey.text-italic.q-mb-sm(:style="{ 'font-size': '12px' }") {{ $t('proposals.version-history.versionHistory') }}
   .row
-    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-if="versionHistory.masterpolicy.length" :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': !versionHistory.masterpolicy[0].system_originalApprovedDate_t, 'rejected-card': versionHistory.masterpolicy[0].details_state_s === PROPOSAL_STATE.REJECTED }")
-      q-icon.absolute(v-if="versionHistory.masterpolicy[0].system_originalApprovedDate_t" name="fas fa-arrow-right" :style="{ 'right': '20px', 'top': '28px' }")
-      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': !versionHistory.masterpolicy[0].system_originalApprovedDate_t }")
-        q-icon(name="fas fa-check" :color="versionHistory.masterpolicy[0].system_originalApprovedDate_t ? 'white' : versionHistory.state === PROPOSAL_STATE.REJECTED ? 'negative' : 'primary'")
-      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': !versionHistory.masterpolicy[0].system_originalApprovedDate_t }") {{ $t('proposals.version-history.original') }}
-      div {{ parsedDate(versionHistory.masterpolicy[0].system_originalApprovedDate_t) }}
-    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-else :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': !versionHistory.masterpolicy.length, 'rejected-card': versionHistory.state === PROPOSAL_STATE.REJECTED }")
-      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': !versionHistory.masterpolicy.length }")
-        q-icon(name="fas fa-check" :color="versionHistory.masterpolicy.length ? 'white' : versionHistory.state === PROPOSAL_STATE.REJECTED ? 'negative' : 'primary'")
-      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': !versionHistory.masterpolicy.length }") {{ $t('proposals.version-history.original') }}
-      div(v-if="versionHistory.state === PROPOSAL_STATE.PROPOSED") {{ $t('proposals.version-history.currentOnVoting') }}
-      div(v-else-if="versionHistory.state === PROPOSAL_STATE.REJECTED") {{ $t('proposals.version-history.rejected') }}
-      div(v-else) {{ parsedDate(versionHistory.originalApprovedDate) }}
-    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-if="versionHistory.masterpolicy.length" :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': versionHistory.masterpolicy[0].system_originalApprovedDate_t, 'rejected-card': versionHistory.state === PROPOSAL_STATE.REJECTED }")
-      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': versionHistory.masterpolicy[0].system_originalApprovedDate_t }")
+    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-if="versionHistory?.masterpolicy.length" :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': !versionHistory?.masterpolicy[0].system_originalApprovedDate_t, 'rejected-card': versionHistory?.masterpolicy[0].details_state_s === PROPOSAL_STATE.REJECTED }")
+      q-icon.absolute(v-if="versionHistory?.masterpolicy[0].system_originalApprovedDate_t" name="fas fa-arrow-right" :style="{ 'right': '20px', 'top': '28px' }")
+      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': !versionHistory?.masterpolicy[0].system_originalApprovedDate_t }")
+        q-icon(name="fas fa-check" :color="versionHistory?.masterpolicy[0].system_originalApprovedDate_t ? 'white' : versionHistory?.state === PROPOSAL_STATE.REJECTED ? 'negative' : 'primary'")
+      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': !versionHistory?.masterpolicy[0].system_originalApprovedDate_t }") {{ $t('proposals.version-history.original') }}
+      div {{ parsedDate(versionHistory?.masterpolicy[0].system_originalApprovedDate_t) }}
+    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-else :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': !versionHistory?.masterpolicy.length, 'rejected-card': versionHistory?.state === PROPOSAL_STATE.REJECTED }")
+      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': !versionHistory?.masterpolicy.length }")
+        q-icon(name="fas fa-check" :color="versionHistory?.masterpolicy.length ? 'white' : versionHistory?.state === PROPOSAL_STATE.REJECTED ? 'negative' : 'primary'")
+      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': !versionHistory?.masterpolicy.length }") {{ $t('proposals.version-history.original') }}
+      div(v-if="versionHistory?.state === PROPOSAL_STATE.PROPOSED") {{ $t('proposals.version-history.currentOnVoting') }}
+      div(v-else-if="versionHistory?.state === PROPOSAL_STATE.REJECTED") {{ $t('proposals.version-history.rejected') }}
+      div(v-else) {{ parsedDate(versionHistory?.originalApprovedDate) }}
+    .bg-internal-bg.q-mr-md.q-mb-md.rounded-border.q-pa-md(v-if="versionHistory?.masterpolicy.length" :style="{ 'min-width': '160px', 'position': 'relative' }" :class="{ 'selected-card': versionHistory?.masterpolicy[0].system_originalApprovedDate_t, 'rejected-card': versionHistory?.state === PROPOSAL_STATE.REJECTED }")
+      div(:style="{ 'border-radius': '50%', 'background': '#242F5D', 'width': '30px', 'height': '30px', 'display': 'flex', 'justify-content': 'center', 'align-items': 'center' }" :class="{ 'selected-icon': versionHistory?.masterpolicy[0].system_originalApprovedDate_t }")
         q-icon(name="fas fa-check" :color="versionHistory.masterpolicy[0].system_originalApprovedDate_t ? 'primary' : 'white'")
-      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': versionHistory.masterpolicy[0].system_originalApprovedDate_t }") Version 2
-      div(v-if="versionHistory.state === PROPOSAL_STATE.PROPOSED") {{ $t('proposals.version-history.currentOnVoting') }}
-      div(v-else-if="versionHistory.state === PROPOSAL_STATE.REJECTED") {{ $t('proposals.version-history.rejected') }}
-      div(v-else) {{ parsedDate(versionHistory.originalApprovedDate) }}
+      .h-h5.text-weight-700.q-mt-sm.q-mb-md(:class="{ 'selected-title': versionHistory?.masterpolicy[0].system_originalApprovedDate_t }") Version 2
+      div(v-if="versionHistory?.state === PROPOSAL_STATE.PROPOSED") {{ $t('proposals.version-history.currentOnVoting') }}
+      div(v-else-if="versionHistory?.state === PROPOSAL_STATE.REJECTED") {{ $t('proposals.version-history.rejected') }}
+      div(v-else) {{ parsedDate(versionHistory?.originalApprovedDate) }}
 
 </template>
 <styles lang="stylus">
diff --git a/src/pages/proposals/create/StepReview.vue b/src/pages/proposals/create/StepReview.vue
index 340833ede..dbe3f02cf 100644
--- a/src/pages/proposals/create/StepReview.vue
+++ b/src/pages/proposals/create/StepReview.vue
@@ -197,7 +197,7 @@ export default {
 
 <template lang="pug">
 .step-review
-  proposal-view(preview="preview" v-bind="draft" :withToggle="withToggle" :isBadge="isBadge")
+  proposal-view(preview="preview" v-bind="draft" :withToggle="withToggle" :isBadge="isBadge" hidePolicyHistory)
     template(v-slot:bottom)
       nav.full-width.row.justify-end.q-mt-xl.q-gutter-xs(v-if="$q.screen.gt.md")
         q-btn.h-btn2.q-px-xl(v-if="!disablePrevButton" @click="$emit('prev')" color="primary" :label="$t('pages.proposals.create.stepreview.back')" no-caps outline rounded flat)

From c0003b6c11b4ae46a1a1004ebfe456a8b6f896e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Mon, 11 Sep 2023 07:18:14 -0600
Subject: [PATCH 12/16] fix(tokens): add correct settings after custom token
 created (#2422)

* fix(tokens): add correct settings after custom token created

* refactor(settings-token): remove commented code
---
 src/components/dao/settings-tokens.vue    | 53 +++++++++++++----------
 src/pages/proposals/create/StepPayout.vue |  6 +--
 src/store/dao/actions.js                  |  4 +-
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/components/dao/settings-tokens.vue b/src/components/dao/settings-tokens.vue
index de004e64d..4801011af 100644
--- a/src/components/dao/settings-tokens.vue
+++ b/src/components/dao/settings-tokens.vue
@@ -51,7 +51,6 @@ export default {
         utilityDigits: 2, // 1.0, 1.00, 1.000
         utilityTokenMultiplier: 1,
         utilityAmount: null, // i.e 100000 or -1 for infinite supply
-        // utilityValue: '1', // The equivalent value of 1 token in USD
 
         // Voice token (aka voice_token = voiceDigits voiceSymbol)
         voiceName: 'Voice Token',
@@ -95,6 +94,7 @@ export default {
       const [treasuryDigits, treasurySymbol] = this.daoSettings.settings_pegToken_a.split(' ')
       const [utilityDigits, utilitySymbol] = this.daoSettings.settings_rewardToken_a.split(' ')
       const [voiceDigits, voiceSymbol] = this.daoSettings.settings_voiceToken_a.split(' ')
+      const [utilityAmount] = this.daoSettings?.settings_rewardTokenMaxSupply_a?.split(' ')
 
       this.tokens = {
         // ...this.tokens,
@@ -102,19 +102,13 @@ export default {
         treasurySymbol,
         treasuryDigits: treasuryDigits.split('.')[1].length, // 1.0, 1.00, 1.000
         treasuryTokenMultiplier: this.daoSettings.settings_treasuryTokenMultiplier_i,
-        // treasuryCurrency: {
-        //   label: `${currency.USD?.symbol} - ${currency.USD?.name}`,
-        //   value: currency.USD.code,
-        //   ...currency.USD
-        // },
 
         // // Utility token
         utilityName: this.daoSettings.settings_rewardTokenName_s || utilitySymbol,
         utilitySymbol,
         utilityDigits: utilityDigits.split('.')[1].length, // 1.0, 1.00, 1.000, // 1.0, 1.00, 1.000
         utilityTokenMultiplier: this.daoSettings.settings_utilityTokenMultiplier_i,
-        utilityAmount: this.daoSettings.settings_rewardTokenMaxSupply_a, // i.e 100000 or -1 for infinite supply
-        // // utilityValue: '1', // The equivalent value of 1 token in USD
+        utilityAmount: parseInt(utilityAmount) === -1 ? '∞' : utilityAmount, // i.e 100000 or -1 for infinite supply
 
         // // Voice token
         voiceName: voiceSymbol,
@@ -145,18 +139,18 @@ export default {
         }
       },
       immediate: true
-    },
-
-    'tokens.treasuryCurrency': {
-      handler: function (value) {
-        if (value) {
-          this.tokens.treasuryName = value?.name
-          this.tokens.treasurySymbol = value?.code
-        }
-      },
-      immediate: true
     }
 
+    // 'tokens.treasuryCurrency': {
+    //   handler: function (value) {
+    //     if (value) {
+    //       this.tokens.treasuryName = value?.name
+    //       this.tokens.treasurySymbol = value?.code
+    //     }
+    //   },
+    //   immediate: true
+    // }
+
   }
 
 }
@@ -180,11 +174,16 @@ export default {
               .col-12.col-md-6
                 label.h-label {{ $t('configuration.settings-tokens.tresury.form.name.label') }}
                 q-input.q-my-xs(
+                  :debounce="200"
+                  :disable="selectedDao.hasCustomToken"
+                  :filled="selectedDao.hasCustomToken"
+                  :placeholder="$t('configuration.settings-tokens.utility.form.name.placeholder')"
                   :rules="[rules.required]"
+                  color="accent"
                   dense
-                  disable
-                  filled
                   lazy-rules
+                  outlined
+                  ref="treasuryName"
                   rounded
                   v-model='tokens.treasuryName'
                 )
@@ -193,13 +192,19 @@ export default {
               .col-12.col-md-6
                 label.h-label {{ $t('configuration.settings-tokens.tresury.form.symbol.label') }}
                 q-input.q-my-xs(
-                  :rules="[rules.required]"
+                  :debounce="200"
+                  :disable="selectedDao.hasCustomToken"
+                  :filled="selectedDao.hasCustomToken"
+                  :placeholder="$t('configuration.settings-tokens.utility.form.symbol.placeholder')"
+                  :rules="[rules.required, rules.isTokenAvailable]"
                   dense
-                  disable
-                  filled
                   lazy-rules
+                  mask="AAAAAAAA"
+                  maxlength="7"
+                  outlined
+                  ref="treasurySymbol"
                   rounded
-                  v-model='tokens.treasurySymbol'
+                  v-model="tokens.treasurySymbol"
                 )
                 q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!selectedDao.hasCustomToken") {{ $t('common.onlyDaoAdmins') }}
 
diff --git a/src/pages/proposals/create/StepPayout.vue b/src/pages/proposals/create/StepPayout.vue
index 84a16474c..0fb5385f1 100644
--- a/src/pages/proposals/create/StepPayout.vue
+++ b/src/pages/proposals/create/StepPayout.vue
@@ -97,7 +97,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters('dao', ['daoSettings']),
+    ...mapGetters('dao', ['daoSettings', 'selectedDao']),
     nextDisabled () {
       const proposalType = this.$store.state.proposals.draft.category.key
 
@@ -389,7 +389,7 @@ widget(:class="{ 'disable-step': currentStepName !== 'step-payout' && $q.screen.
   .row(v-if="isAssignment")
     label.text-bold {{ toggle ? $t('pages.proposals.create.steppayout.compensationForOnePeriod') : $t('pages.proposals.create.steppayout.compensationForOneCycle') }}
   .q-col-gutter-xs.q-mt-sm(:class="{ 'q-mt-xxl':$q.screen.lt.md || $q.screen.md, 'row':$q.screen.gt.md }")
-    .col-4(:class="{ 'q-mt-md':$q.screen.lt.md || $q.screen.md }" v-if="fields.reward")
+    .col-4(:class="{ 'q-mt-md':$q.screen.lt.md || $q.screen.md }" v-if="fields.reward && selectedDao.hasCustomToken")
       label.h-label(v-if="$store.state.dao.settings.rewardToken !== 'HYPHA'") {{ `${fields.reward.label} (${$store.state.dao.settings.rewardToken})` }}
       label.h-label(v-else) {{ `${fields.reward.label}` }}
       .row.full-width.items-center.q-mt-xs
@@ -397,7 +397,7 @@ widget(:class="{ 'disable-step': currentStepName !== 'step-payout' && $q.screen.
         q-input.rounded-border.col(dense :readonly="!custom" outlined v-model="utilityToken" rounded v-if="isAssignment && !isFounderRole")
         q-input.rounded-border.col(dense :readonly="!custom" outlined v-model="reward" rounded v-else)
     .col-4(:class="{ 'q-mt-md':$q.screen.lt.md || $q.screen.md }" v-if="fields.peg")
-      label.h-label(v-if="$store.state.dao.settings.pegToken !== 'HUSD'") {{ `${fields.peg.label} (${$store.state.dao.settings.pegToken})` }}
+      label.h-label(v-if="$store.state.dao.settings.pegToken !== 'HUSD'") {{ `${fields.peg.label} ${$store.state.dao.settings.pegToken ? `(${$store.state.dao.settings.pegToken})`:''}`}}
       label.h-label(v-else) {{ `${fields.peg.label}` }}
       .row.full-width.items-center.q-mt-xs
         token-logo.q-mr-xs(size="40px" type="cash" :daoLogo="daoSettings.logo")
diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js
index 4524cb609..fcc7a9391 100644
--- a/src/store/dao/actions.js
+++ b/src/store/dao/actions.js
@@ -1075,8 +1075,8 @@ export const createTokens = async function ({ state, rootState }, data) {
           // voice token
           [
             { label: 'content_group_label', value: ['string', 'voice_details'] },
-            { label: 'voice_token_decay_period', value: ['int64', 604800] },
-            { label: 'voice_token_decay_per_period_x10M', value: ['int64', 100000] },
+            { label: 'voice_token_decay_period', value: ['int64', data?.voiceDecayPeriod] },
+            { label: 'voice_token_decay_per_period_x10M', value: ['int64', data?.voiceDecayPercent] },
             { label: 'voice_token_multiplier', value: ['int64', data?.voiceTokenMultiplier] }
           ]
         ]

From e7cbe3bdd6794a753eb2c99010f0f1b23733f50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Mon, 11 Sep 2023 07:18:47 -0600
Subject: [PATCH 13/16] fix(step-details): add max char message (#2425)

---
 src/pages/proposals/create/StepDetails.vue | 34 ++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/pages/proposals/create/StepDetails.vue b/src/pages/proposals/create/StepDetails.vue
index ba55f10e6..077439058 100644
--- a/src/pages/proposals/create/StepDetails.vue
+++ b/src/pages/proposals/create/StepDetails.vue
@@ -62,20 +62,11 @@ export default {
     sanitizeDescription () { return this.$sanitize(this.description, { allowedTags: [] }) },
 
     canGoNext () {
-      if (this.$store.state.proposals.draft.edit) {
-        if (this.sanitizeDescription.length < DESCRIPTION_MAX_LENGTH) {
-          if (this.fields.purpose && this.purpose.length === 0) {
-            return true
-          }
-          return false
-        }
-      } else if (this.sanitizeDescription.length > 0 && this.title.length > 0 && this.sanitizeDescription.length < DESCRIPTION_MAX_LENGTH && this.title.length <= TITLE_MAX_LENGTH) {
-        if (this.fields.purpose && this.purpose.length === 0) {
-          return true
-        }
-        return false
-      }
-      return true
+      return [
+        this.title !== '',
+        this.description !== '',
+        this.sanitizeDescription.length < DESCRIPTION_MAX_LENGTH
+      ].every()
     },
 
     title: {
@@ -99,9 +90,7 @@ export default {
       set (value) { this.$store.commit('proposals/setVotingMethod', value) }
     },
 
-    isEditing () {
-      return this.$store.state.proposals.draft.edit
-    }
+    isEditing () { return this.$store.state.proposals.draft.edit }
   },
 
   created () {
@@ -163,7 +152,16 @@ widget
       q-input.q-mt-xs.rounded-border(:disable="isEditing || isProposalType(PROPOSAL_TYPE.ABILITY) || isProposalType(PROPOSAL_TYPE.ASSIGNBADGE)" :placeholder="fields.title.placeholder" :rules="[val => !!val || $t('pages.proposals.create.stepdetails.titleIsRequired'), val => (val.length <= TITLE_MAX_LENGTH) || $t('pages.proposals.create.stepdetails.proposalTitleLengthHasToBeLess', { TITLE_MAX_LENGTH: TITLE_MAX_LENGTH, length: title.length })]" dense outlined v-model="title")
     .col.q-mt-sm(v-if="fields.description")
       label.h-label {{ fields.description.label }}
-      q-field.q-mt-xs.rounded-border(:rules="[rules.required, val => this.$sanitize(val, { allowedTags: [] }).length < DESCRIPTION_MAX_LENGTH || $t('pages.proposals.create.stepdetails.theDescriptionMustContainLess', { DESCRIPTION_MAX_LENGTH: DESCRIPTION_MAX_LENGTH, length: this.$sanitize(description, { allowedTags: [] }).length })]" dense maxlength="4000" outlined ref="bio" stack-label v-model="description" :disable="isProposalType(PROPOSAL_TYPE.ABILITY) || isProposalType(PROPOSAL_TYPE.ASSIGNBADGE)")
+      q-field.q-mt-xs.rounded-border(
+        :disable="isProposalType(PROPOSAL_TYPE.ABILITY) || isProposalType(PROPOSAL_TYPE.ASSIGNBADGE)"
+        :rules="[rules.required, val => this.$sanitize(val, { allowedTags: [] }).length < DESCRIPTION_MAX_LENGTH || $t('pages.proposals.create.stepdetails.theDescriptionMustContainLess', { DESCRIPTION_MAX_LENGTH: DESCRIPTION_MAX_LENGTH, length: this.$sanitize(description, { allowedTags: [] }).length })]"
+        dense
+        maxlength="4000"
+        outlined
+        ref="description"
+        stack-label
+        v-model="description"
+      )
         input-editor.full-width(:placeholder="fields.description.placeholder" :toolbar="[['bold', 'italic', /*'strike', 'underline'*/],['token', 'hr', 'link', 'custom_btn'],['quote', 'unordered', 'ordered']]" flat ref="editorRef" v-model="description")
     .col.q-mt-sm(v-if="fields.circle")
       label.h-label {{ fields.circle.label }}

From 1514097ba36c2b25a0fcd4bf91c91d8511e2ff3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Mon, 11 Sep 2023 07:21:50 -0600
Subject: [PATCH 14/16] fix(settings-token): disable field if user not admin
 (#2426)

---
 src/components/dao/settings-tokens.vue | 35 +++++++++++++-------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/dao/settings-tokens.vue b/src/components/dao/settings-tokens.vue
index 4801011af..91ab17ec6 100644
--- a/src/components/dao/settings-tokens.vue
+++ b/src/components/dao/settings-tokens.vue
@@ -32,7 +32,6 @@ export default {
 
   data () {
     return {
-
       tokens: {
         // Treasury token (aka peg_token = treasuryDigits treasurySymbol)
         treasuryName: null,
@@ -246,7 +245,7 @@ export default {
             .col-12
               label.h-label {{ $t('configuration.settings-tokens.tresury.form.digits.label') }}
               input-slider(
-                :disable="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
                 :max="3"
                 :maxLabel="$t('configuration.settings-tokens.tresury.form.digits.morePrecise')"
                 :min="1"
@@ -267,8 +266,8 @@ export default {
                 label.h-label {{ $t('configuration.settings-tokens.utility.form.name.label') }}
                 q-input.q-my-xs(
                   :debounce="200"
-                  :disable="selectedDao.hasCustomToken"
-                  :filled="selectedDao.hasCustomToken"
+                  :disable="selectedDao.hasCustomToken || !isAdmin"
+                  :filled="selectedDao.hasCustomToken || !isAdmin"
                   :placeholder="$t('configuration.settings-tokens.utility.form.name.placeholder')"
                   :rules="[rules.required]"
                   color="accent"
@@ -285,8 +284,8 @@ export default {
                 label.h-label {{ $t('configuration.settings-tokens.utility.form.symbol.label') }}
                 q-input.q-my-xs(
                   :debounce="200"
-                  :disable="selectedDao.hasCustomToken"
-                  :filled="selectedDao.hasCustomToken"
+                  :disable="selectedDao.hasCustomToken || !isAdmin"
+                  :filled="selectedDao.hasCustomToken || !isAdmin"
                   :placeholder="$t('configuration.settings-tokens.utility.form.symbol.placeholder')"
                   :rules="[rules.required, rules.isTokenAvailable]"
                   dense
@@ -304,8 +303,8 @@ export default {
               label.h-label {{ $t('configuration.settings-tokens.utility.form.value.label') }}
               q-input.q-my-xs(
                 :debounce="200"
-                :disable="selectedDao.hasCustomToken"
-                :filled="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
+                :filled="selectedDao.hasCustomToken || !isAdmin"
                 :placeholder="$t('configuration.settings-tokens.utility.form.value.placeholder')"
                 :rules="[rules.requiredIf(tokens.utilityAmount > 0)]"
                 color="accent"
@@ -322,8 +321,8 @@ export default {
               label.h-label {{ $t('configuration.settings-tokens.utility.form.multiplier.label') }}
               q-input.q-my-xs(
                 :debounce="200"
-                :disable="selectedDao.hasCustomToken"
-                :filled="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
+                :filled="selectedDao.hasCustomToken || !isAdmin"
                 :rules="[rules.required]"
                 color="accent"
                 dense
@@ -339,7 +338,7 @@ export default {
             .col-12
               label.h-label {{ $t('configuration.settings-tokens.utility.form.digits.label') }}
               input-slider(
-                :disable="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
                 :max="3"
                 :maxLabel="$t('configuration.settings-tokens.tresury.form.digits.morePrecise')"
                 :min="1"
@@ -389,15 +388,17 @@ export default {
             .row.q-col-gutter-md
               .col-12.col-md-8(:class="{'q-mt-sm': !$q.screen.gt.md}")
                 label.h-label {{ $t('configuration.settings-tokens.voice.form.decayPeriod.label') }}
-                custom-period-input.q-my-xs(:disable="selectedDao.hasCustomToken" v-model='tokens.voiceDecayPeriod')
+                custom-period-input.q-my-xs(:disable="selectedDao.hasCustomToken || !isAdmin" v-model='tokens.voiceDecayPeriod')
                 q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle" v-if="!selectedDao.hasCustomToken") {{ $t('common.onlyDaoAdmins') }}
 
               .col-12.col-md-4(:class="{'q-mt-sm': !$q.screen.gt.md}")
                 label.h-label {{ $t('configuration.settings-tokens.voice.form.decayPercent.label') }}
                 q-input.q-my-xs(
                   :debounce="200"
-                  :disable="selectedDao.hasCustomToken"
-                  :filled="selectedDao.hasCustomToken"
+                  :disable="selectedDao.hasCustomToken || !isAdmin"
+                  :filled="selectedDao.hasCustomToken || !isAdmin"
+                  :max="100"
+                  :min="0"
                   :placeholder="$t('configuration.settings-tokens.voice.form.decayPercent.placeholder')"
                   :rules="[rules.required]"
                   color="accent"
@@ -416,8 +417,8 @@ export default {
               label.h-label {{ $t('configuration.settings-tokens.voice.form.multiplier.label') }}
               q-input.q-my-xs(
                 :debounce="200"
-                :disable="selectedDao.hasCustomToken"
-                :filled="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
+                :filled="selectedDao.hasCustomToken || !isAdmin"
                 :rules="[rules.required]"
                 color="accent"
                 dense
@@ -433,7 +434,7 @@ export default {
             .col-12
               label.h-label {{ $t('configuration.settings-tokens.voice.form.digits.label') }}
               input-slider(
-                :disable="selectedDao.hasCustomToken"
+                :disable="selectedDao.hasCustomToken || !isAdmin"
                 :max="3"
                 :maxLabel="$t('configuration.settings-tokens.tresury.form.digits.morePrecise')"
                 :min="1"

From 760a95fead2ec54e3079d034a1a5638abb189d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Mon, 11 Sep 2023 07:22:41 -0600
Subject: [PATCH 15/16] refactor: swap subscribeToMore with pollInterval
 (#2428)

---
 src/components/proposals/voter-list.vue | 33 +++++-----
 src/pages/dho/Members.vue               |  8 ++-
 src/pages/proposals/ProposalDetail.vue  | 33 +++++-----
 src/pages/proposals/ProposalList.vue    | 83 +++++++++++++------------
 4 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/src/components/proposals/voter-list.vue b/src/components/proposals/voter-list.vue
index 9da9257d4..369083f17 100644
--- a/src/components/proposals/voter-list.vue
+++ b/src/components/proposals/voter-list.vue
@@ -63,22 +63,23 @@ export default {
         this.voteCount = data?.getDocument?.voteAggregate?.count
       },
       fetchPolicy: 'no-cache',
-      subscribeToMore: {
-        document: gql`subscription proposalVotes($docId: String!, $first: Int, $offset: Int) { ${PROPOSAL_VOTES_QUERY} }`,
-        skip () { return !this.proposalId },
-        variables () { return { docId: this.proposalId } },
-        updateQuery: (previousResult, { subscriptionData }) => {
-          if (!subscriptionData.data) {
-            return previousResult
-          }
-          if (!previousResult) {
-            return undefined
-          }
-
-          return subscriptionData.data
-        }
-
-      }
+      pollInterval: 1000
+      // subscribeToMore: {
+      //   document: gql`subscription proposalVotes($docId: String!, $first: Int, $offset: Int) { ${PROPOSAL_VOTES_QUERY} }`,
+      //   skip () { return !this.proposalId },
+      //   variables () { return { docId: this.proposalId } },
+      //   updateQuery: (previousResult, { subscriptionData }) => {
+      //     if (!subscriptionData.data) {
+      //       return previousResult
+      //     }
+      //     if (!previousResult) {
+      //       return undefined
+      //     }
+
+      //     return subscriptionData.data
+      //   }
+
+      // }
 
     }
   },
diff --git a/src/pages/dho/Members.vue b/src/pages/dho/Members.vue
index cf3a233c8..065929867 100644
--- a/src/pages/dho/Members.vue
+++ b/src/pages/dho/Members.vue
@@ -170,7 +170,9 @@ export default {
 
       result ({ data }) {
         this.applicantsCount = data?.getDao?.applicantAggregate?.count
-      }
+      },
+
+      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
     },
 
     daoCoreMembers: {
@@ -196,7 +198,9 @@ export default {
 
       result ({ data }) {
         this.coreMembersCount = data?.getDao?.memberAggregate?.count
-      }
+      },
+
+      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
     }
 
     // daoCommunityMembers: {
diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue
index 7a32507ae..8bc7c5669 100644
--- a/src/pages/proposals/ProposalDetail.vue
+++ b/src/pages/proposals/ProposalDetail.vue
@@ -940,22 +940,23 @@ export default {
       variables () { return { docId: this.docId } },
       fetchPolicy: 'no-cache',
 
-      subscribeToMore: {
-        document: gql`subscription proposalDetail($docId: String!) { ${PROPOSAL_QUERY} }`,
-        skip () { return !this.docId },
-        variables () { return { docId: this.docId } },
-        updateQuery: (previousResult, { subscriptionData }) => {
-          if (!subscriptionData.data) {
-            return previousResult
-          }
-          if (!previousResult) {
-            return undefined
-          }
-
-          return subscriptionData.data
-        }
-
-      },
+      pollInterval: 1000, // TODO: Swap with subscribe once dgraph is ready
+      // subscribeToMore: {
+      //   document: gql`subscription proposalDetail($docId: String!) { ${PROPOSAL_QUERY} }`,
+      //   skip () { return !this.docId },
+      //   variables () { return { docId: this.docId } },
+      //   updateQuery: (previousResult, { subscriptionData }) => {
+      //     if (!subscriptionData.data) {
+      //       return previousResult
+      //     }
+      //     if (!previousResult) {
+      //       return undefined
+      //     }
+
+      //     return subscriptionData.data
+      //   }
+
+      // },
 
       result (data) {
         if ((data.data.getDocument.dao[0].details_daoName_n !== this.selectedDao.name) && !this.isBadge) {
diff --git a/src/pages/proposals/ProposalList.vue b/src/pages/proposals/ProposalList.vue
index 32e3144ff..39bc39eee 100644
--- a/src/pages/proposals/ProposalList.vue
+++ b/src/pages/proposals/ProposalList.vue
@@ -401,27 +401,28 @@ export default {
         }
       },
       fetchPolicy: 'no-cache',
-      subscribeToMore: {
-        document: require('~/query/proposals/dao-proposals-active-vote-subs.gql'),
-        variables () {
-          return {
-            // first: (this.pagination.offset + this.pagination.first), // TODO: For some reason this does not work
-            docId: this.selectedDao.docId,
-            user: this.account
-          }
-        },
-        skip () { return !this.selectedDao?.docId },
-        updateQuery: (previousResult, { subscriptionData }) => {
-          if (!subscriptionData?.data) {
-            return previousResult
-          }
-          if (!previousResult?.data) {
-            return undefined
-          }
-          subscriptionData.data.queryDao[0].proposal = [...previousResult.data.queryDao[0].proposal, ...subscriptionData.data.queryDao[0].proposal]
-          return subscriptionData
-        }
-      }
+      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
+      // subscribeToMore: {
+      //   document: require('~/query/proposals/dao-proposals-active-vote-subs.gql'),
+      //   variables () {
+      //     return {
+      //       // first: (this.pagination.offset + this.pagination.first), // TODO: For some reason this does not work
+      //       docId: this.selectedDao.docId,
+      //       user: this.account
+      //     }
+      //   },
+      //   skip () { return !this.selectedDao?.docId },
+      //   updateQuery: (previousResult, { subscriptionData }) => {
+      //     if (!subscriptionData?.data) {
+      //       return previousResult
+      //     }
+      //     if (!previousResult?.data) {
+      //       return undefined
+      //     }
+      //     subscriptionData.data.queryDao[0].proposal = [...previousResult.data.queryDao[0].proposal, ...subscriptionData.data.queryDao[0].proposal]
+      //     return subscriptionData
+      //   }
+      // }
     },
     stagedProposals: {
       query: gql`query stageProposals($docId: String!, $first: Int!, $offset: Int!) { ${STAGED_PROPOSALS_QUERY} }`,
@@ -436,27 +437,27 @@ export default {
         }
       },
       fetchPolicy: 'no-cache',
+      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
+      // subscribeToMore: {
+      //   document: gql`subscription stageProposals($docId: String!, $first: Int, $offset: Int) { ${STAGED_PROPOSALS_QUERY} }`,
+      //   skip () { return !this.selectedDao?.docId },
+      //   variables () {
+      //     return {
+      //       docId: this.selectedDao.docId,
+      //       user: this.account
+      //     }
+      //   },
+      //   updateQuery: (previousResult, { subscriptionData }) => {
+      //     if (!subscriptionData.data) {
+      //       return previousResult
+      //     }
+      //     if (!previousResult) {
+      //       return undefined
+      //     }
 
-      subscribeToMore: {
-        document: gql`subscription stageProposals($docId: String!, $first: Int, $offset: Int) { ${STAGED_PROPOSALS_QUERY} }`,
-        skip () { return !this.selectedDao?.docId },
-        variables () {
-          return {
-            docId: this.selectedDao.docId,
-            user: this.account
-          }
-        },
-        updateQuery: (previousResult, { subscriptionData }) => {
-          if (!subscriptionData.data) {
-            return previousResult
-          }
-          if (!previousResult) {
-            return undefined
-          }
-
-          return subscriptionData.data
-        }
-      }
+      //     return subscriptionData.data
+      //   }
+      // }
     },
 
     proposalsCount: {

From 15789e836065537c2d321c43fee5962ce00260c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsenije=20Savi=C4=87?= <arsenijesavic@me.com>
Date: Mon, 11 Sep 2023 07:25:03 -0600
Subject: [PATCH 16/16] fix(settings-token): add correct maping for decay
 (#2427)

* fix(settings-token): add correct maping for decay

* refactor(settings-token): add min max decay var
---
 src/components/dao/settings-tokens.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/dao/settings-tokens.vue b/src/components/dao/settings-tokens.vue
index 91ab17ec6..215658682 100644
--- a/src/components/dao/settings-tokens.vue
+++ b/src/components/dao/settings-tokens.vue
@@ -2,6 +2,7 @@
 import { mapActions, mapGetters } from 'vuex'
 import { validation } from '~/mixins/validation'
 import currency from 'src/data/currency.json'
+import map from '~/utils/map'
 
 const mapCurrency = (currency) => (_) => ({
   label: `${currency[_]?.symbol} - ${currency[_]?.name}`,
@@ -9,6 +10,9 @@ const mapCurrency = (currency) => (_) => ({
   ...currency[_]
 })
 
+const MIN_DECAY = 0
+const MAX_DECAY = 10000000
+
 export default {
   name: 'settings-token',
   mixins: [validation],
@@ -79,7 +83,10 @@ export default {
       try {
         const isValid = await this.validate(this.tokens)
         if (isValid) {
-          await this.createTokens({ ...this.tokens })
+          await this.createTokens({
+            ...this.tokens,
+            voiceDecayPercent: map(this.tokens.voiceDecayPercent, 0, 100, MIN_DECAY, MAX_DECAY)
+          })
         }
       } catch (e) {
         const message = e.message || e.cause.message
@@ -115,7 +122,7 @@ export default {
         voiceDigits: voiceDigits.split('.')[1].length,
         voiceTokenMultiplier: this.daoSettings.settings_voiceTokenMultiplier_i,
         voiceDecayPeriod: this.daoSettings.settings_voiceTokenDecayPeriod_i,
-        voiceDecayPercent: this.daoSettings.settings_voiceTokenDecayPerPeriodX10M_i
+        voiceDecayPercent: map(this.daoSettings.settings_voiceTokenDecayPerPeriodX10M_i, MIN_DECAY, MAX_DECAY, 0, 100)
 
       }
     }
@@ -400,7 +407,7 @@ export default {
                   :max="100"
                   :min="0"
                   :placeholder="$t('configuration.settings-tokens.voice.form.decayPercent.placeholder')"
-                  :rules="[rules.required]"
+                  :rules="[rules.required, rules.greaterThan(0), rules.lessOrEqualThan(100)]"
                   color="accent"
                   dense
                   lazy-rules