From 42584917076e4ea8f416276ace9c4e91d72a56e8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 15:34:25 +0000
Subject: [PATCH 1/5] chore(develop): release 2.9.1

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..232630420
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Changelog
+
+## [2.9.1](https://github.com/hypha-dao/dho-web-client/compare/v2.9.0...v2.9.1) (2022-08-23)
+
+
+### Bug Fixes
+
+* revert to claim all with multiple transaction ([#1509](https://github.com/hypha-dao/dho-web-client/issues/1509)) ([2e1ed55](https://github.com/hypha-dao/dho-web-client/commit/2e1ed55fb7f21c3b35f56ca418ba40d3e7499710))
diff --git a/package.json b/package.json
index 04dcd03a5..00c722cad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dho-web-client",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)",
   "productName": "Hypha DHO",
   "author": "Max <max@digitalscarcity.io>",

From 925cf020b4c3c95b7a1e4eb2cda56d6a8682fc3e Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Wed, 24 Aug 2022 19:04:32 +0200
Subject: [PATCH 2/5] feat(explore page): show dao creation wizard to hypha
 members only (#1514)

* style(explore page): order imports

* refactor(explore page): swap cta button

* feat(explore page): show create-dho-widget only to the hypha members

* feat(router): redirect from dho-creation page is dao is not hypha
---
 src/pages/dho/Explore.vue | 12 +++++-------
 src/router/index.js       |  7 +++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/pages/dho/Explore.vue b/src/pages/dho/Explore.vue
index f372c6041..f1ffab746 100644
--- a/src/pages/dho/Explore.vue
+++ b/src/pages/dho/Explore.vue
@@ -1,13 +1,13 @@
 <script>
-import ipfsy from '~/utils/ipfsy'
 import { mapGetters } from 'vuex'
+import ipfsy from '~/utils/ipfsy'
 
 export default {
   name: 'page-explore',
   components: {
+    BaseBanner: () => import('~/components/common/base-banner.vue'),
     CreateDhoWidget: () => import('~/components/organization/create-dho-widget.vue'),
     DhoCard: () => import('~/components/navigation/dho-card.vue'),
-    BaseBanner: () => import('~/components/common/base-banner.vue'),
     FilterWidget: () => import('~/components/filters/filter-widget.vue')
   },
   async mounted () {
@@ -60,9 +60,8 @@ export default {
   },
 
   computed: {
-    ...mapGetters('dao', ['daoSettings']),
+    ...mapGetters('dao', ['daoSettings', 'isHypha']),
     ...mapGetters('accounts', ['isAdmin', 'isProduction']),
-    ...mapGetters('dao', ['isHypha', 'daoSettings']),
 
     banner () {
       return {
@@ -155,9 +154,8 @@ export default {
   .row.full-width(v-if="isShowingExploreBanner")
     base-banner(v-bind="banner" @onClose="hideExploreBanner")
       template(v-slot:buttons)
-        q-btn.q-px-lg.h-btn1(v-show="!isProduction && isHypha && isAdmin" no-caps rounded unelevated color="secondary" :to="{ name: 'dho-creation' }") Create your own DAO
         a(target="_tab" href='https://hypha.earth/')
-          q-btn.h-h7(color="white" no-caps flat rounded label="More about Hypha" href='https://hypha.earth/')
+          q-btn.q-px-lg.h-btn1(no-caps rounded unelevated color="secondary" href="https://hypha.earth/" target="_blank") Discover More
   .row.q-mt-sm(:class="{ 'column-sm': !$q.screen.gt.sm }")
     .col-12.col-md.col-lg.col-xl.q-py-md(ref="scrollContainer")
         q-infinite-scroll(@load="onLoad" :offset="250" :scroll-target="$refs.scrollContainer" ref="scroll")
@@ -177,7 +175,7 @@ export default {
           @update:textFilter="updateDaoName",
           :debounce="1000"
         )
-        create-dho-widget(v-show="!isProduction && isHypha && isAdmin").z-10
+        create-dho-widget(v-show="isHypha").z-10
 
 </template>
 <style lang="stylus" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 4e4e0cf04..f4b9f074b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,13 +24,20 @@ export default function ({ store }) {
 
   Router.beforeEach((to, from, next) => {
     const isAuthenticated = localStorage.getItem('autoLogin')
+    const isHypha = store.getters['dao/isHypha']
     const isMember = localStorage.getItem('isMember')
     const daoName = to.params.dhoname
 
+    // Only show dho-creation wizard to the hypha members
+    if (to.name && to.name === 'dho-creation' && !isHypha) {
+      next({ path: `/${daoName}/` })
+    }
+
     // Temporal redirection for hypha explorer page
     if (to.name && to.name === 'root') {
       next({ path: '/hypha/explore' })
     }
+
     if (to.matched.some(record => record.meta.requiresAuth) || to.matched.some(record => record.meta.requiresAuthMember)) {
       if (!isAuthenticated) {
         next({ path: `/${daoName}/login` })

From 7163dada7cc512ceb9de80a3b79cdecf573a9bdc Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Mon, 29 Aug 2022 09:23:55 +0200
Subject: [PATCH 3/5] feat(proposals): add pull interval to auto refresh
 (#1529)

* refactor: move turndown converters into step-description getter setter

* refactor: remove timeout from route push and add data param

* feat(proposal-card): add loading skeleton

* feat(proposals page): add pull interval for created proposal

* feat(proposal): add pull interval during publishing
---
 src/components/proposals/proposal-card.vue    | 89 ++++++++++---------
 src/pages/proposals/ProposalCreate.vue        |  7 +-
 src/pages/proposals/ProposalDetail.vue        | 35 ++++++--
 src/pages/proposals/ProposalList.vue          | 29 ++++--
 .../proposals/create/StepDescription.vue      |  5 +-
 src/store/proposals/index.js                  | 23 +++--
 6 files changed, 117 insertions(+), 71 deletions(-)

diff --git a/src/components/proposals/proposal-card.vue b/src/components/proposals/proposal-card.vue
index 6f034dac7..8a2a4a99c 100644
--- a/src/components/proposals/proposal-card.vue
+++ b/src/components/proposals/proposal-card.vue
@@ -110,50 +110,53 @@ widget.cursor-pointer.card(
     div(
       :style="{ 'min-height': card ? '344px': '145px', 'max-width': card ? '302px' : '940px', 'full-width': list, 'background': 'white' }"
       :class="{'q-px-lg': card, 'q-py-xl': card, 'q-px-xl': list, 'col': list}"
-      ).row.items-center.justify-between.round-corners
-      //- q-btn.absolute-top-right.vote-btn(v-if="vote" :color="vote.color" round :icon="vote.icon" size="sm" padding="sm")
-        q-tooltip(anchor="top middle" self="bottom middle" :content-style="{ 'font-size': '1em' }"
-          ) You voted '{{ vote.vote }}' on this proposal
-      .col-8(:class="{ 'col-12': card}" :style="{ height: list ? 'inherit' : '145px' }")
-        .row.items-center
-          proposal-card-chips(:type="type" :state="status" :showVotingState="false" :accepted="isAccepted" :compensation="compensation" :salary="salary" :commit="commit && commit.value")
-          //- .q-my-auto.h-b3.text-italic.text-body(v-if="subtitle && list") {{ subtitle }} //- Removed subtitle
-        //- .row.two-lines
-        //- .q-mb-xxs.h-b3.text-italic.text-body(v-if="subtitle && card") {{ subtitle }} //- Removed subtitle
-        .h-h5.two-lines(v-if="title" :class="{ 'one-line': list }") {{ title }}
-        .row.items-center
-          .row.q-mr-md
-            profile-picture(
-              :username="creator"
-              showName
-              lightName
-              size="20px"
-            )
-          .row.items-center.q-ml-sm(v-if="list")
-            q-icon(v-show="status !== 'drafted'" name="fas fa-hourglass-half")
-            .h-b2.text-center.text-body.q-ml-xs.q-mr-md.q-mr-xxxl(v-show="status !== 'drafted'") {{ timeLeftString() }}
-            q-icon(name="far fa-comment-alt")
+      ).round-corners.overflow-hidden.relative
+      q-skeleton(v-if="proposal.loading").absolute-full.round-corners
+
+      .row.items-center.justify-between(v-else)
+        //- q-btn.absolute-top-right.vote-btn(v-if="vote" :color="vote.color" round :icon="vote.icon" size="sm" padding="sm")
+          q-tooltip(anchor="top middle" self="bottom middle" :content-style="{ 'font-size': '1em' }"
+            ) You voted '{{ vote.vote }}' on this proposal
+        .col-8(:class="{ 'col-12': card}" :style="{ height: list ? 'inherit' : '145px' }")
+          .row.items-center
+            proposal-card-chips(:type="type" :state="status" :showVotingState="false" :accepted="isAccepted" :compensation="compensation" :salary="salary" :commit="commit && commit.value")
+            //- .q-my-auto.h-b3.text-italic.text-body(v-if="subtitle && list") {{ subtitle }} //- Removed subtitle
+          //- .row.two-lines
+          //- .q-mb-xxs.h-b3.text-italic.text-body(v-if="subtitle && card") {{ subtitle }} //- Removed subtitle
+          .h-h5.two-lines(v-if="title" :class="{ 'one-line': list }") {{ title }}
+          .row.items-center
+            .row.q-mr-md
+              profile-picture(
+                :username="creator"
+                showName
+                lightName
+                size="20px"
+              )
+            .row.items-center.q-ml-sm(v-if="list")
+              q-icon(v-show="status !== 'drafted'" name="fas fa-hourglass-half")
+              .h-b2.text-center.text-body.q-ml-xs.q-mr-md.q-mr-xxxl(v-show="status !== 'drafted'") {{ timeLeftString() }}
+              q-icon(name="far fa-comment-alt")
+                .h-b2.text-center.text-body.q-ml-xs {{ getCommentCount() }}
+        .col-4(v-show="status !== 'drafted'" :class="{ 'col-12': card }")
+          voting-result(v-if="(!isVotingExpired && !isAccepted) || (!isVotingExpired && isAccepted)"
+                        v-bind="voting"
+                        :expired="isVotingExpired"
+                        :colorConfig="colorConfig"
+                        :colorConfigQuorum="colorConfigQuorum").q-my-xl
+          .row.status-border.q-pa-xs.justify-center.q-my-xxxl(v-else :class="{'text-positive' : isVotingExpired && isAccepted, 'text-negative': isVotingExpired && !isAccepted }")
+            .col-1.flex.items-center.justify-center
+              q-icon(:name="isVotingExpired && isAccepted ? 'fas fa-check' : 'fas fa-times'").q-ml-xs
+            .col
+              .h-b2.text-center(:class="{ 'text-positive': isVotingExpired && isAccepted, 'text-negative': isVotingExpired && !isAccepted }") {{ proposalStatus }}
+            .col-1
+        .col-12(v-if="card").justify-between
+          .row.items-center.float-left
+              q-icon(v-show="status !== 'drafted'" name="fas fa-hourglass-half" size="11px")
+              .h-b2.text-center.text-body.q-ml-xs(v-show="status !== 'drafted'") {{ timeLeftString() }}
+          .row.items-center.float-right
+              q-icon(name="far fa-comment-alt")
               .h-b2.text-center.text-body.q-ml-xs {{ getCommentCount() }}
-      .col-4(v-show="status !== 'drafted'" :class="{ 'col-12': card }")
-        voting-result(v-if="(!isVotingExpired && !isAccepted) || (!isVotingExpired && isAccepted)"
-                      v-bind="voting"
-                      :expired="isVotingExpired"
-                      :colorConfig="colorConfig"
-                      :colorConfigQuorum="colorConfigQuorum").q-my-xl
-        .row.status-border.q-pa-xs.justify-center.q-my-xxxl(v-else :class="{'text-positive' : isVotingExpired && isAccepted, 'text-negative': isVotingExpired && !isAccepted }")
-          .col-1.flex.items-center.justify-center
-            q-icon(:name="isVotingExpired && isAccepted ? 'fas fa-check' : 'fas fa-times'").q-ml-xs
-          .col
-            .h-b2.text-center(:class="{ 'text-positive': isVotingExpired && isAccepted, 'text-negative': isVotingExpired && !isAccepted }") {{ proposalStatus }}
-          .col-1
-      .col-12(v-if="card").justify-between
-        .row.items-center.float-left
-            q-icon(v-show="status !== 'drafted'" name="fas fa-hourglass-half" size="11px")
-            .h-b2.text-center.text-body.q-ml-xs(v-show="status !== 'drafted'") {{ timeLeftString() }}
-        .row.items-center.float-right
-            q-icon(name="far fa-comment-alt")
-            .h-b2.text-center.text-body.q-ml-xs {{ getCommentCount() }}
-    .h-b2.text-center.text-white.indicator(v-if="card || list" :class="{ 'rotate-text': list }") {{ voteTitle }}
+      .h-b2.text-center.text-white.indicator(v-if="card || list" :class="{ 'rotate-text': list }") {{ voteTitle }}
 </template>
 
 <style lang="stylus" scoped>
diff --git a/src/pages/proposals/ProposalCreate.vue b/src/pages/proposals/ProposalCreate.vue
index 908728660..23d3673cb 100644
--- a/src/pages/proposals/ProposalCreate.vue
+++ b/src/pages/proposals/ProposalCreate.vue
@@ -293,17 +293,20 @@ export default {
 
     async stageProposal () {
       try {
-        this.isStaging = true
         if (this.status === 'drafted') await this.updateProposal()
         else await this.createProposal()
 
+        const data = { ...this.$store.state.proposals.draft }
+
         const draftId = this.$store.state.proposals.draft.draftId || undefined
         if (draftId) {
           this.deleteDraft(this.$store.state.proposals.draft)
         }
         this.$store.commit('proposals/reset')
 
-        setTimeout(() => this.$router.push({ name: 'proposals', query: { refetch: true } }), 700)
+        this.$router.push({ name: 'proposals', params: { data }, query: { refetch: true } })
+
+        // setTimeout(() => this.$router.push({ name: 'proposals', query: { data, refetch: true } }), 700)
       } catch (e) {
         const message = e.message || e.cause.message
         // this.saveDraft()
diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue
index 52637e88a..a381952c3 100644
--- a/src/pages/proposals/ProposalDetail.vue
+++ b/src/pages/proposals/ProposalDetail.vue
@@ -34,7 +34,9 @@ export default {
       votes: [],
       supplyTokens: undefined,
       coefficientBase: 10000,
-      cycleDurationSec: 2629800
+      cycleDurationSec: 2629800,
+
+      state: 'WAITING'
     }
   },
 
@@ -149,6 +151,23 @@ export default {
       })
     },
 
+    state: {
+      handler: function (state) {
+        if (state === 'PUBLISHING') {
+          const pull = setInterval(() => {
+            if (this.proposal.details_state_s !== 'drafted') {
+              this.state = 'PUBLISHED'
+              clearInterval(pull)
+            }
+
+            this.$apollo.queries.proposal.refetch()
+          }, 300)
+        }
+      },
+      deep: true,
+      immediate: true
+    },
+
     async votesList () {
       this.votes = await this.loadVotes(this.votesList)
     },
@@ -324,10 +343,8 @@ export default {
 
     async onPublish (proposal) {
       try {
+        this.state = 'PUBLISHING'
         await this.publishProposal(proposal.docId)
-        setTimeout(() => {
-          this.$apollo.queries.proposal.refetch()
-        }, 300)
       } catch (e) {
         const message = e.message || e.cause.message
         this.showNotification({ message, color: 'red' })
@@ -502,7 +519,7 @@ export default {
 
 <template lang="pug">
 .proposal-detail.full-width
-  .row(v-if="$apollo.queries.proposal.loading") Loading...
+  .row(v-if="!$apollo.queries.proposal") Loading...
   .row(v-else-if="proposal")
     .col-12.col-md-9
       proposal-item.bottom-no-rounded(
@@ -559,13 +576,17 @@ export default {
       )
 
     .col-12.col-md-3(:class="{ 'q-pl-md': $q.screen.gt.sm }")
-      widget.bg-primary(v-if="proposalParsing.status(proposal) === 'drafted' && isCreator")
+      widget.bg-primary(v-if="proposalParsing.status(proposal) === 'drafted' && isCreator && state === 'WAITING'")
         h2.h-h4.text-white.leading-normal.q-ma-none Your proposal is on staging
         p.h-b2.q-mt-xl.text-disabled That means your proposal is not published to the blockchain yet. You can still make changes to it, when you feel ready click "Publish" and the voting period will start.
         q-btn.q-mt-xl.text-primary.text-bold.full-width( @click="onPublish(proposal)" color="white" text-color='primary' no-caps rounded) Publish
         q-btn.q-mt-xs.text-bold.full-width( @click="onEdit(proposal)" flat  text-color='white' no-caps rounded) Edit proposal
 
-      div(v-else)
+      widget.bg-primary(v-else-if="proposalParsing.status(proposal) === 'drafted' && isCreator && state === 'PUBLISHING'")
+        h2.h-h4.text-white.leading-normal.q-ma-none Publishing
+        p.h-b2.q-mt-xl.text-disabled ...Please wait...
+
+      div(v-else-if="proposalParsing.status(proposal) !== 'drafted'")
         voting.q-mb-sm(v-if="$q.screen.gt.sm" :proposal="proposal" @voting="onVoting" @on-apply="onApply(proposal)" @on-suspend="onSuspend(proposal)" @on-active="onActive(proposal)" @change-prop="modifyData" @on-withdraw="onWithDraw(proposal)" :activeButtons="isMember")
         voter-list.q-my-md(:votes="votes" @onload="onLoad" :size="voteSize")
 
diff --git a/src/pages/proposals/ProposalList.vue b/src/pages/proposals/ProposalList.vue
index c11f040b7..979dc38ca 100644
--- a/src/pages/proposals/ProposalList.vue
+++ b/src/pages/proposals/ProposalList.vue
@@ -120,7 +120,9 @@ export default {
       ],
       filtersToEvaluate: undefined,
 
-      showStagedProposals: true
+      showStagedProposals: true,
+
+      state: 'LOADING'
     }
   },
 
@@ -185,7 +187,9 @@ export default {
     filteredStagedProposals () {
       if (!this.stagedProposals) return []
 
-      const proposals = []
+      const proposals = [
+        ...(this.state === 'CREATING' ? [{ loading: true }] : [])
+      ]
       this.stagedProposals.forEach((proposal) => {
         let found = false
         this.filters.forEach((filter) => {
@@ -216,8 +220,23 @@ export default {
   watch: {
     '$route.query.refetch': {
       handler: function (refetch) {
-        if (refetch) {
-          this.$apollo.queries.stagedProposals.refetch()
+        const createdProposal = this.$route.params.data
+        if (refetch && createdProposal) {
+          this.state = 'CREATING'
+
+          const pullStagedProposals = setInterval(() => {
+            const isCreated = this.stagedProposals.find(_ =>
+              _.details_title_s === createdProposal.title &&
+              _.details_description_s === createdProposal.description
+            )
+            if (isCreated) {
+              this.state = 'CREATED'
+              this.$router.replace({ params: { data: null }, query: {} })
+              clearInterval(pullStagedProposals)
+            }
+
+            this.$apollo.queries.stagedProposals.refetch()
+          }, 300)
         }
       },
       deep: true,
@@ -385,7 +404,7 @@ export default {
       base-placeholder.q-mr-sm(v-if="!filteredProposals.length && !filteredStagedProposals.length && !$apollo.loading" title= "No Proposals" subtitle="Your organization has not created any proposals yet. You can create a new proposal by clicking the button below."
         icon= "fas fa-file-medical" :actionButtons="[{label: 'Create a new Proposal', color: 'primary', onClick: () => $router.push(`/${this.daoSettings.url}/proposals/create`), disable: !isMember, disableTooltip: 'You must be a member'}]" )
       .q-mb-xl(v-show="showStagedProposals && filteredStagedProposals.length > 0")
-        proposal-list(:username="account" :proposals="filteredStagedProposals" :supply="supply" :view="view")
+        proposal-list(:username="account" :proposals="filteredStagedProposals" :supply="supply" :view="view" :loading="state !== 'CREATING'" count="1")
       q-infinite-scroll(@load="onLoad" :offset="500" ref="scroll" :initial-index="1" v-if="filteredProposals.length").scroll
         proposal-list(:username="account" :proposals="filteredProposals" :supply="supply" :view="view")
     .col-3
diff --git a/src/pages/proposals/create/StepDescription.vue b/src/pages/proposals/create/StepDescription.vue
index 4139466b0..afa182d00 100644
--- a/src/pages/proposals/create/StepDescription.vue
+++ b/src/pages/proposals/create/StepDescription.vue
@@ -1,6 +1,7 @@
 <script>
 import { validation } from '~/mixins/validation'
 // import { isURL } from 'validator'
+import { toHTML, toMarkdown } from '~/utils/turndown'
 
 const TITLE_MAX_LENGTH = 50
 const DESCRIPTION_MAX_LENGTH = 2000
@@ -53,11 +54,11 @@ export default {
 
     description: {
       get () {
-        return this.$store.state.proposals.draft.description || ''
+        return toHTML(this.$store.state.proposals.draft.description) || ''
       },
 
       set (value) {
-        this.$store.commit('proposals/setDescription', value)
+        this.$store.commit('proposals/setDescription', toMarkdown(value))
       }
     },
 
diff --git a/src/store/proposals/index.js b/src/store/proposals/index.js
index 0c3f4e5af..a86c94391 100644
--- a/src/store/proposals/index.js
+++ b/src/store/proposals/index.js
@@ -1,4 +1,3 @@
-import Turndown from 'turndown'
 import Storage from '~/localStorage/storage'
 /**
  * This vuex data store contains the data needed in the proposal creation wizard.
@@ -404,7 +403,7 @@ export default {
             { label: 'period_count', value: ['int64', draft.periodCount] },
             { label: 'original_document', value: ['int64', draft.linkedDocId] },
             { label: 'ballot_title', value: ['string', draft.title] },
-            { label: 'ballot_description', value: ['string', new Turndown().turndown(draft.description)] }
+            { label: 'ballot_description', value: ['string', draft.description] }
           ]
         } else {
           publishToStaging = true
@@ -414,7 +413,7 @@ export default {
                 { label: 'content_group_label', value: ['string', 'details'] },
                 { label: 'recipient', value: ['name', rootState.accounts.account] },
                 { label: 'title', value: ['string', draft.title] },
-                { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+                { label: 'description', value: ['string', draft.description] },
                 { label: 'url', value: ['string', draft.url] },
                 { label: 'is_custom', value: ['int64', draft.custom ? 1 : 0] },
                 { label: 'deferred_perc_x100', value: ['int64', draft.deferred] }
@@ -443,7 +442,7 @@ export default {
                 { label: 'content_group_label', value: ['string', 'details'] },
                 { label: 'assignee', value: ['name', rootState.accounts.account] },
                 { label: 'title', value: ['string', draft.title] },
-                { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+                { label: 'description', value: ['string', draft.description] },
                 // { label: 'url', value: ['string', draft.url] },
                 { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
                 { label: 'time_share_x100', value: ['int64', draft.commitment] },
@@ -460,7 +459,7 @@ export default {
                 { label: 'content_group_label', value: ['string', 'details'] },
                 { label: 'assignee', value: ['name', rootState.accounts.account] },
                 { label: 'title', value: ['string', draft.title] },
-                { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+                { 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] }
@@ -472,7 +471,7 @@ export default {
               content = [
                 { label: 'content_group_label', value: ['string', 'details'] },
                 { label: 'title', value: ['string', draft.title] },
-                { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+                { label: 'description', value: ['string', draft.description] },
                 { label: 'url', value: ['string', draft.url] },
                 { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
                 { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
@@ -485,7 +484,7 @@ export default {
               content = [
                 { label: 'content_group_label', value: ['string', 'details'] },
                 { label: 'title', value: ['string', draft.title] },
-                { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+                { label: 'description', value: ['string', draft.description] },
                 { label: 'icon', value: ['string', draft.icon] },
                 { label: 'voice_coefficient_x10000', value: ['int64', parseFloat(draft.voiceCoefficient.value)] },
                 { label: 'reward_coefficient_x10000', value: ['int64', parseFloat(draft.rewardCoefficient.value)] },
@@ -527,7 +526,7 @@ export default {
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'recipient', value: ['name', rootState.accounts.account] },
               { label: 'title', value: ['string', draft.title] },
-              { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+              { label: 'description', value: ['string', draft.description] },
               { label: 'is_custom', value: ['int64', draft.custom ? 1 : 0] },
               { label: 'url', value: ['string', draft.url] },
               { label: 'deferred_perc_x100', value: ['int64', draft.deferred] }
@@ -553,7 +552,7 @@ export default {
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'assignee', value: ['name', rootState.accounts.account] },
               { label: 'title', value: ['string', draft.title] },
-              { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+              { label: 'description', value: ['string', draft.description] },
               // { label: 'url', value: ['string', draft.url] },
               { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
               { label: 'time_share_x100', value: ['int64', draft.commitment] },
@@ -569,7 +568,7 @@ export default {
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'assignee', value: ['name', rootState.accounts.account] },
               { label: 'title', value: ['string', draft.title] },
-              { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+              { 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] }
@@ -580,7 +579,7 @@ export default {
             content = [
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'title', value: ['string', draft.title] },
-              { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+              { label: 'description', value: ['string', draft.description] },
               { label: 'url', value: ['string', draft.url] },
               { label: 'annual_usd_salary', value: ['asset', `${parseFloat(draft.annualUsdSalary).toFixed(2)} USD`] },
               { label: 'fulltime_capacity_x100', value: ['int64', Math.round(parseFloat(draft.roleCapacity) * 100)] },
@@ -592,7 +591,7 @@ export default {
             content = [
               { label: 'content_group_label', value: ['string', 'details'] },
               { label: 'title', value: ['string', draft.title] },
-              { label: 'description', value: ['string', new Turndown().turndown(draft.description)] },
+              { label: 'description', value: ['string', draft.description] },
               { label: 'icon', value: ['string', draft.icon] },
               { label: 'voice_coefficient_x10000', value: ['int64', parseFloat(draft.voiceCoefficient.value)] },
               { label: 'reward_coefficient_x10000', value: ['int64', parseFloat(draft.rewardCoefficient.value)] },

From 2ec524f53217dffa05a90c63ae293f14be643c83 Mon Sep 17 00:00:00 2001
From: Arsenije Savic <arsenijesavic@me.com>
Date: Mon, 29 Aug 2022 09:24:11 +0200
Subject: [PATCH 4/5] fix(configuration page): remove pattern slip and disable
 announcement edit for non admins  (#1530)

* fix(settings-communicaiton): disable editor input if not admin

* fix(settings-design): set patternBase64 to empty if no pattern

* fix(settings-design): disable no pattern is user is not admin

* fix(settings-design): remove pattern slip
---
 src/components/dao/settings-communication.vue | 1 +
 src/components/dao/settings-design.vue        | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/dao/settings-communication.vue b/src/components/dao/settings-communication.vue
index cc8634874..10160873d 100644
--- a/src/components/dao/settings-communication.vue
+++ b/src/components/dao/settings-communication.vue
@@ -69,6 +69,7 @@ export default {
               v-model="announcement.message"
             )
               q-editor.full-width(
+                :disable="!isAdmin"
                 :toolbar="[['bold', 'italic', /*'strike', 'underline'*/],['token', 'hr', 'link', 'custom_btn'],['quote', 'unordered', 'ordered']]"
                 flat
                 placeholder="Max 140 characters"
diff --git a/src/components/dao/settings-design.vue b/src/components/dao/settings-design.vue
index d5849deae..53903daf6 100644
--- a/src/components/dao/settings-design.vue
+++ b/src/components/dao/settings-design.vue
@@ -280,6 +280,7 @@ ${backgroundImage
     this.$watch(() => [this.form.pattern, this.form.patternColor, this.form.patternOpacity],
       async ([pattern, patternColor, patternOpacity]) => {
         if (!pattern) {
+          this.$emit('change', 'patternBase64', '')
           return
         }
 
@@ -506,18 +507,18 @@ ${backgroundImage
                                 :style="{'background': pattern.color, 'border': form.pattern === pattern.cid ? '1px solid #242F5D' : '1px solid transparent', 'padding': '1px'}"
                                 @click="form.pattern = pattern.cid"
                                 flat
-                                padding="1px"
                                 round
                             )
                                 q-avatar(size="40px")
                                     img(:src="pattern.href" :style="{'transform': 'scale(2)'}")
 
                         q-btn(
+                            :disable="!isAdmin"
                             :style="{'border': form.pattern === '' ? '1px solid #242F5D' : '1px solid #84878E'}"
                             @click="form.pattern = null"
+                            color='primary'
                             flat
                             round
-                            color='primary'
                             text-color="black"
                         )
                             q-icon.q-pa-xs(size="xs" name="fas fa-ban").text-h-gray

From 61f12619d0bfd45066b29db51bd1c15f8768baa0 Mon Sep 17 00:00:00 2001
From: Irving Puga <ipugakn@gmail.com>
Date: Mon, 29 Aug 2022 00:24:47 -0700
Subject: [PATCH 5/5] feat: disabled cash claims for hypha (#1531)

---
 src/store/dao/mutations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js
index 119c72b1d..44233a051 100644
--- a/src/store/dao/mutations.js
+++ b/src/store/dao/mutations.js
@@ -37,7 +37,7 @@ export const switchDao = (state, daos) => {
       membersApplicationEnabled: Boolean(settings.settings_membersApplicationEnabled_i),
       removableBannersEnabled: Boolean(settings.settings_removableBannersEnabled_i),
       registrationEnabled: !settings.settings_isHypha_i, // Currently disabled for hypha, TODO: obtain flag from server
-      cashClaimsEnabled: settings.settings_claimEnabled_i,
+      cashClaimsEnabled: !settings.settings_isHypha_i, // settings.settings_claimEnabled_i,
 
       votingDurationSec: settings?.settings_votingDurationSec_i,
       periodDurationSec: settings?.settings_periodDurationSec_i,