chore: release 2.13.0

Release-As: 2.13.0
hypha-dao · Sep 22, 2022 · 136e8ed · 136e8ed
2 parents f59ff44 + 08878ef
commit 136e8ed
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 62 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -43,9 +43,9 @@ jobs:
           ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-testnet-documents/_search'
           ELASTIC_SEARCH_API_KEY: ${{ secrets.DEV_ELASTIC_SEARCH_API_KEY }}
           IPFS_URL: 'ipfs.infura.io'
-          IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM'
+          IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz'
           IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
-          IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/'
+          IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/'
           MULTISIG_CONTRACT: 'msig.hypha'
       - name: S3 sync
         uses: jakejarvis/s3-sync-action@master

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -43,9 +43,9 @@ jobs:
           ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-mainnet-documents/_search'
           ELASTIC_SEARCH_API_KEY: ${{ secrets.PROD_ELASTIC_SEARCH_API_KEY }}
           IPFS_URL: 'ipfs.infura.io'
-          IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM'
+          IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz'
           IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
-          IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/'
+          IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/'
           MULTISIG_CONTRACT: 'msigdhohypha'
 
       - name: S3 sync

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -43,9 +43,9 @@ jobs:
           ELASTIC_SEARCH_URL: 'https://hypha.es.eu-west-1.aws.found.io:9243/dho-mainnet-documents/_search'
           ELASTIC_SEARCH_API_KEY: ${{ secrets.PROD_ELASTIC_SEARCH_API_KEY }}
           IPFS_URL: 'ipfs.infura.io'
-          IPFS_PROJECT_ID: '20mUXy1Rao9DE32ei9mWy9TlpYM'
+          IPFS_PROJECT_ID: '2F5pWHIOMgHji1DeqUT0mGpvySz'
           IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
-          IPFS_GATEWAY: 'https://gateway.ipfs.io/ipfs/'
+          IPFS_GATEWAY: 'https://hypha.infura-ipfs.io/ipfs/'
           MULTISIG_CONTRACT: 'msigdhohypha'
 
       - name: S3 sync

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## [2.12.0](https://github.com/hypha-dao/dho-web-client/compare/v2.11.0...v2.12.0) (2022-09-14)
+
+
+### Features
+
+* add "edit" button for active documents ([#1567](https://github.com/hypha-dao/dho-web-client/issues/1567)) ([#1583](https://github.com/hypha-dao/dho-web-client/issues/1583)) ([adda57c](https://github.com/hypha-dao/dho-web-client/commit/adda57c80d72dab3a33af064d4708b50fa5aa812))
+* add cash claims flag ([#1490](https://github.com/hypha-dao/dho-web-client/issues/1490)) ([962e104](https://github.com/hypha-dao/dho-web-client/commit/962e104bd59e86bca749aa2c764498655f40c3db))
+* add delete button to comments ([#1543](https://github.com/hypha-dao/dho-web-client/issues/1543)) ([#1581](https://github.com/hypha-dao/dho-web-client/issues/1581)) ([9c1f574](https://github.com/hypha-dao/dho-web-client/commit/9c1f57467a315b2e0cb0f596e0f7bc00e3fb0c5f))
+* added "delete proposal" button to staging proposals ([#1520](https://github.com/hypha-dao/dho-web-client/issues/1520)) ([#1538](https://github.com/hypha-dao/dho-web-client/issues/1538)) ([7d48d6f](https://github.com/hypha-dao/dho-web-client/commit/7d48d6fcb94fb5f0d904f4bd2755d89167f91e55))
+* **configuration:** add dynamic explore banner ([#1588](https://github.com/hypha-dao/dho-web-client/issues/1588)) ([34ced1b](https://github.com/hypha-dao/dho-web-client/commit/34ced1b0ec1e2a9450e21530818fdbfbe0a1e444))
+* **dao-proposal-stage:** add type edit ([#1589](https://github.com/hypha-dao/dho-web-client/issues/1589)) ([3504910](https://github.com/hypha-dao/dho-web-client/commit/3504910527f0d0606197817220d605d134cb07ec))
+* disabled cash claims for hypha ([#1531](https://github.com/hypha-dao/dho-web-client/issues/1531)) ([61f1261](https://github.com/hypha-dao/dho-web-client/commit/61f12619d0bfd45066b29db51bd1c15f8768baa0))
+* **explore page:** show dao creation wizard to hypha members only ([#1514](https://github.com/hypha-dao/dho-web-client/issues/1514)) ([925cf02](https://github.com/hypha-dao/dho-web-client/commit/925cf020b4c3c95b7a1e4eb2cda56d6a8682fc3e))
+* **proposals:** add pull interval for the published proposals ([#1575](https://github.com/hypha-dao/dho-web-client/issues/1575)) ([62ac339](https://github.com/hypha-dao/dho-web-client/commit/62ac33975300f5fdbd56348145302bdbf2a7456e))
+* **proposals:** add pull interval to auto refresh ([#1529](https://github.com/hypha-dao/dho-web-client/issues/1529)) ([7163dad](https://github.com/hypha-dao/dho-web-client/commit/7163dada7cc512ceb9de80a3b79cdecf573a9bdc))
+
+
+### Bug Fixes
+
+* badge proposal details and formatting issues ([#1551](https://github.com/hypha-dao/dho-web-client/issues/1551)) ([33b755e](https://github.com/hypha-dao/dho-web-client/commit/33b755e035cc17202fbfdf9f52bcd130587dff14))
+* **changelog:** change relase notes for 2.10 ([#1546](https://github.com/hypha-dao/dho-web-client/issues/1546)) ([6eccb13](https://github.com/hypha-dao/dho-web-client/commit/6eccb13e7c86030e9bd41afbdb45468dc3d44c3a))
+* character max length in creating description for proposal ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1573](https://github.com/hypha-dao/dho-web-client/issues/1573)) ([6c881e8](https://github.com/hypha-dao/dho-web-client/commit/6c881e8541fce64b4232226968870e467c3863f1))
+* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
+* current dao in left menu (dao switcher) has been hidden ([#1544](https://github.com/hypha-dao/dho-web-client/issues/1544)) ([#1565](https://github.com/hypha-dao/dho-web-client/issues/1565)) ([04dca98](https://github.com/hypha-dao/dho-web-client/commit/04dca98e9cfa64934f790b474e13f3f13fb5e46d))
+* enable deferred button for archived assignments [#1489](https://github.com/hypha-dao/dho-web-client/issues/1489) ([#1534](https://github.com/hypha-dao/dho-web-client/issues/1534)) ([a29b231](https://github.com/hypha-dao/dho-web-client/commit/a29b231aba7097fa69f65013ffb070d033dbe31b))
+* **filter-widget:** set width to be same on all screens ([#1542](https://github.com/hypha-dao/dho-web-client/issues/1542)) ([#1586](https://github.com/hypha-dao/dho-web-client/issues/1586)) ([1a15f85](https://github.com/hypha-dao/dho-web-client/commit/1a15f857d1e31d9cfbc173aead1f93baeff7d0be))
+* fix wrong titles and salary tag for search items ([#1513](https://github.com/hypha-dao/dho-web-client/issues/1513)) ([#1540](https://github.com/hypha-dao/dho-web-client/issues/1540)) ([c32b3aa](https://github.com/hypha-dao/dho-web-client/commit/c32b3aa0c19a24c1da10a961bd961fdec485c137))
+* fixed color for CTA buttons ([#1522](https://github.com/hypha-dao/dho-web-client/issues/1522)) ([#1560](https://github.com/hypha-dao/dho-web-client/issues/1560)) ([3f29e32](https://github.com/hypha-dao/dho-web-client/commit/3f29e32fa7183d20659844eb8efb4e25ae9b2bcc))
+* fixed filter on the search page, added missing filter types ([#1415](https://github.com/hypha-dao/dho-web-client/issues/1415)) ([#1537](https://github.com/hypha-dao/dho-web-client/issues/1537)) ([7ad7515](https://github.com/hypha-dao/dho-web-client/commit/7ad751570faea7797f4d1a477c68e80c2d7db75e))
+* fixed widgets links in home and organisation pages ([#1550](https://github.com/hypha-dao/dho-web-client/issues/1550)) ([#1564](https://github.com/hypha-dao/dho-web-client/issues/1564)) ([c600166](https://github.com/hypha-dao/dho-web-client/commit/c600166b8334046b9fd84333d018e779019c770f))
+* hide badge multiplier ([#1476](https://github.com/hypha-dao/dho-web-client/issues/1476)) ([#1535](https://github.com/hypha-dao/dho-web-client/issues/1535)) ([c498dbb](https://github.com/hypha-dao/dho-web-client/commit/c498dbb76549621b3a0afb36b47a5d93bd090560))
+* proposal description max length ([#1496](https://github.com/hypha-dao/dho-web-client/issues/1496)) ([20f0d46](https://github.com/hypha-dao/dho-web-client/commit/20f0d46bc11f8b5469e9db914e0ed81ee0bcbff6))
+* **proposal:** voting widget pagination ([#1541](https://github.com/hypha-dao/dho-web-client/issues/1541)) ([#1577](https://github.com/hypha-dao/dho-web-client/issues/1577)) ([697ba46](https://github.com/hypha-dao/dho-web-client/commit/697ba462592d2e66850ba613dd0a0715f1b7ee43))
+* remove padding top for dashboard pages ([#1524](https://github.com/hypha-dao/dho-web-client/issues/1524)) ([#1587](https://github.com/hypha-dao/dho-web-client/issues/1587)) ([1bce19f](https://github.com/hypha-dao/dho-web-client/commit/1bce19f783654b25e3f0c2c6013b1cc08e61e41d))
+* 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))
+* select options in filter widget has been fixed ([#1523](https://github.com/hypha-dao/dho-web-client/issues/1523), [#1556](https://github.com/hypha-dao/dho-web-client/issues/1556)) ([#1580](https://github.com/hypha-dao/dho-web-client/issues/1580)) ([8c927bb](https://github.com/hypha-dao/dho-web-client/commit/8c927bbd8b2b8d449acec26bc434a9362153174b))
+* show dynamic deferred on active and archived proposals ([#1578](https://github.com/hypha-dao/dho-web-client/issues/1578)) ([d895d70](https://github.com/hypha-dao/dho-web-client/commit/d895d7020ef78919de618efb197062a80d0495fd))
+* warning about character max from description has been removed ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1563](https://github.com/hypha-dao/dho-web-client/issues/1563)) ([571f374](https://github.com/hypha-dao/dho-web-client/commit/571f37485c15985e0e5564af0a4bcebe16923f76))
+
 ## [2.11.0](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.11.0) (2022-09-05)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dho-web-client",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)",
   "productName": "Hypha DHO",
   "author": "Max <[email protected]>",

diff --git a/src/components/common/button-card.vue b/src/components/common/button-card.vue
@@ -78,11 +78,11 @@ q-btn.button(
         q-icon(v-if="!hideIcon" :name="icon" size="14px" :color="!outline ? 'primary' : 'white'")
     //- .div.q-pa-none.chip-container.q-px-xs
     //-   chips.nudge-right(v-if="chip && chip.label" :tags="[ chip ]")
-    .row.q-mx-sm.q-my-xxs.text-left(v-if="from && end")
+    .row.q-mx-sm.q-my-xxs.text-left(v-if="from || end")
       //- .h-h7-regular(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") From
-      .h-h6.q-mb-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(from) }}
-      .h-h7-regular(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") To
-      .h-h6.q-py-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(end) }}
+      .h-h6.q-mb-xxs(v-if="from" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(from) }}
+      .h-h7-regular(v-if="from || end" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") Until
+      .h-h6.q-py-xxs(v-if="end" :class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ formatDate(end) }}
     .row.q-mx-sm.q-my-xxs.text-left(v-else-if="title || subtitle")
       .h-h5-regular.q-mb-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ title }}
       .h-h5.q-py-xxs(:class="outline ? 'text-primary' : 'text-white'" :style="{ width: `${width - 16}px`}") {{ subtitle }}

diff --git a/src/css/quasar-classes-override.styl b/src/css/quasar-classes-override.styl
@@ -132,9 +132,12 @@ a, a:hover, a:focus
 .q-date__calendar-item--in
   color var(--q-color-primary) !important
   .q-btn
-    outline-color var(--q-color-primary) !important
+    color var(--q-color-secondary)
+    outline-color var(--q-color-secondary) !important
     outline-width 1px !important
     outline-style solid !important
+  .bg-primary
+    background var(--q-color-secondary) !important
 
 
 .q-date__range-from:before

diff --git a/src/mixins/format.js b/src/mixins/format.js
@@ -33,7 +33,7 @@ export const format = {
       return ''
     },
 
-    getFormatedTokenAmount (amount = 0, maxFigures = 4, maxDecimals = 2) {
+    getFormatedTokenAmount (amount = 0, maxFigures = 4, maxDecimals = 0) {
       if (amount === 0) return '0'
       if (amount === undefined) return ''
       if (amount === null) return ''

diff --git a/src/pages/profiles/Wallet.vue b/src/pages/profiles/Wallet.vue
@@ -168,7 +168,15 @@ export default {
 <template lang="pug">
 q-page.page-wallet
   .row
-    .col-9.q-pr-md
+    .col-12.col-md-3
+      wallet(:username="account" no-title)
+      wallet-adresses.q-mt-md(
+        :isHypha="daoSettings.isHypha"
+        :walletAdresses="walletAddressForm"
+        @onSave="saveWalletAddresses"
+        v-if="isOwner"
+      )
+    .col-9.q-pl-md
       widget(no-padding).q-px-xl
         q-table.wallet-table(
           :columns="columns"
@@ -182,7 +190,7 @@ q-page.page-wallet
           template(v-slot:body="props")
             q-tr(:props="props").q-tr--no-hover
               q-td(key="activity" :props="props")
-                p.q-py-md.q-ma-none {{ truncate(props.row.memo, 40) }}
+                p(:style="'overflow:hidden; white-space:nowrap; text-overflow: ellipsis;'").q-py-md.q-ma-none {{ props.row.memo }}
               q-td(key="date" :props="props")
                 p.q-py-md.q-ma-none.text-italic {{ formatDate(props.row.createdDate) }}
               q-td(key="status" :props="props")
@@ -195,15 +203,6 @@ q-page.page-wallet
                   q-img.table-icon(size="10px" v-if="isToken(props.row.amount, 'SEEDS')" src="~assets/icons/seeds.png")
                   p.q-px-xs.q-ma-none {{ formatCurrency(props.row.amount)}}
 
-    .col-12.col-md-3
-      wallet(:username="account" no-title)
-      wallet-adresses.q-mt-md(
-        :isHypha="daoSettings.isHypha"
-        :walletAdresses="walletAddressForm"
-        @onSave="saveWalletAddresses"
-        v-if="isOwner"
-      )
-
 </template>
 
 <style lang="stylus" scoped>

diff --git a/src/pages/proposals/create/StepDateDuration.vue b/src/pages/proposals/create/StepDateDuration.vue
@@ -35,12 +35,10 @@ export default {
           this.startIndex = index
           this.endIndex = index + periodCount - 1
           this.originalEndIndex = this.endIndex
-
           const start = new Date(this.start(v[this.startIndex]))
-          const end = new Date(this.start(v[this.endIndex]))
           const from = date.formatDate(start, 'YYYY/MM/DD')
-          const to = date.formatDate(end, 'YYYY/MM/DD')
-          this.setRangeToCalendar({ from, to })
+          const to = this.endIndex
+          this.setRangeToCalendar(from, to)
         }
       },
       fetchPolicy: 'no-cache'
@@ -59,7 +57,8 @@ export default {
       dateDuration: {
         from: Date.now().toString(),
         to: Date.now().toString()
-      }
+      },
+      startValue: Date.now().toString()
     }
   },
   mounted () {
@@ -127,24 +126,17 @@ export default {
     extendedPeriods () {
       this.endIndex = this.lastOriginalIndex + this.extendedPeriods
     },
-    dateDuration: {
+    startValue: {
       handler: function () {
-        if (this.dateDuration) {
+        if (this.startValue) {
           const startIndex = this.periods.period.findIndex(
-            el => new Date(el.details_startTime_t).toDateString() === new Date(this.dateDuration.from).toDateString()
-          )
-          const endIndex = this.periods.period.findIndex(
-            el => new Date(el.details_startTime_t).toDateString() === new Date(this.dateDuration.to).toDateString()
+            el => new Date(el.details_startTime_t).toDateString() === new Date(this.startValue).toDateString()
           )
           this.startIndex = startIndex
-          this.endIndex = endIndex
         } else {
           this.startIndex = -1
-          this.endIndex = -1
         }
-      },
-      immediate: false,
-      deep: true
+      }
     }
   },
 
@@ -155,11 +147,13 @@ export default {
       this.startDate = undefined
       this.originalEndIndex = undefined
       const startPeriod = this.$store.state.proposals.draft.startPeriod
-      const periodCount = this.$store.state.proposals.draft.periodCount
+      const endIndex = this.$store.state.proposals.draft.endIndex
+      // const periodCount = this.$store.state.proposals.draft.periodCount
       await this.$nextTick()
-      if (periodCount && startPeriod) {
+      if (startPeriod || endIndex) {
         this.isFromDraft = true
         this.startDate = startPeriod.details_startTime_t
+        this.endIndex = endIndex
       }
     },
     isInvalidDate (date) {
@@ -194,9 +188,10 @@ export default {
       }
       return false
     },
-    async setRangeToCalendar ({ from, to }) {
+    async setRangeToCalendar (from, to) {
       await this.$nextTick()
-      this.dateDuration = { from, to }
+      this.startValue = from
+      this.endIndex = to
     },
     title (period) {
       return 'Until'
@@ -206,11 +201,13 @@ export default {
     start (period) {
       return period && new Date(period.details_startTime_t)
     },
-
     reset () {
       if (!this.$store.state.proposals.draft.edit) {
         this.isFromDraft = false
         this.startDate = undefined
+        this.$store.commit('proposals/setStartPeriod', null)
+        this.$store.commit('proposals/setEndIndex', null)
+        this.startValue = -1
         this.startIndex = -1
         this.endIndex = -1
         this.resetPeriods = true
@@ -220,6 +217,10 @@ export default {
       } else {
         this.endIndex = this.startIndex + this.originalPeriodCount - 1
       }
+    },
+    setEndIndex (index) {
+      this.endIndex = index
+      this.$store.commit('proposals/setEndIndex', this.endIndex)
     }
   }
 }
@@ -239,35 +240,38 @@ widget
 
   div(v-if="!$store.state.proposals.draft.edit")
     div
-      label.h-h4 Range of dates
-      q-date.full-width.q-mt-lg(
-        range
-        v-model="dateDuration"
+      label.h-h4 Start date
+      q-date.full-width.q-mt-lg.bg-internal-bg(
+        v-model="startValue"
         ref="calendar"
         :options="datePickerOptions"
+        :style="'border-radius: 10px; box-shadow: none;'"
+        minimal
       )
 
     div.q-mt-xl
-      label.h-h4 Duration in periods
+      label.h-h4 Duration in cycles
 
     .row.justify-center(v-if="$apolloData.queries.periods.loading")
       q-spinner-tail(size="md")
 
     .row.q-mt-sm(v-else)
-      .row.q-gutter-sm(v-if="periods && periods.period")
-        template(v-for="i in periodCount")
+      .row.q-gutter-sm(v-if="periods && periods.period && startIndex >= 0")
+        template(v-for="(period, index) in periods.period.slice(startIndex + 1)" v-if="index < 12")
           period-card(
-            :title="title(periods.period[startIndex + i - 1])"
-            :start="start(periods.period[startIndex + i - 1])"
-            :end="start(periods.period[startIndex + i])"
-            :selected="true"
-            :index="i"
+            :clickable="true"
+            :title="title(period)"
+            :end="start(period)"
+            @click="setEndIndex(index + startIndex)"
+            :index="index"
+            :selected="index === endIndex - startIndex"
           )
           //- :outline="i === startIndex && endIndex === -1"
   .confirm.q-mt-xl(v-if="startIndex >= 0 && endIndex >= 0")
-    .text-italic.text-grey-7.text-center {{ `${periodCount} period${periodCount > 1 ? 's' : ''} - ${dateString}` }}
+    .text-italic.text-grey-7.text-center(v-if="periodCount >= 0") {{ `${periodCount} period${periodCount > 1 ? 's' : ''} - ${dateString}` }}
     .text-negative.h-b2.q-ml-xs.text-center(v-if="periodCount >= (MAX_PERIODS + originalPeriodCount) && $store.state.proposals.draft.edit") You must select less than {{MAX_PERIODS + originalPeriodCount}} periods (Currently you selected {{periodCount}} periods)
     .text-negative.h-b2.q-ml-xs.text-center(v-if="periodCount >= MAX_PERIODS && !$store.state.proposals.draft.edit") You must select less than {{MAX_PERIODS}} periods (Currently you selected {{periodCount}} periods)
+    .text-negative.h-b2.q-ml-xs.text-center(v-if="periodCount < 0") The start date must not be later than the end date
   .next-step.q-mt-xl
     .row.items-center(:class="{'justify-between': !$store.state.proposals.draft.edit, 'justify-end': $store.state.proposals.draft.edit}")
       q-btn.q-px-md(no-caps rounded unelevated color="white" text-color="primary" label="Reset selection" @click="reset()" v-if="!$store.state.proposals.draft.edit")