From 419416c25e914d575f6708208c38e90ee36a85ba Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:28:18 +0300 Subject: [PATCH 01/65] chore(master): release 2.44.1 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63779955..75e4df9d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [2.44.1](https://github.com/hypha-dao/dho-web-client/compare/v2.44.0...v2.44.1) (2024-03-27) + + +### Bug Fixes + +* **createdao:** move voice decay ([a3b6087](https://github.com/hypha-dao/dho-web-client/commit/a3b608782c5516124557d667ef6bf0d027d08f7e)) +* **createdao:** move voice decay ([a3b6087](https://github.com/hypha-dao/dho-web-client/commit/a3b608782c5516124557d667ef6bf0d027d08f7e)) +* **createdao:** move voice decay ([f1c796b](https://github.com/hypha-dao/dho-web-client/commit/f1c796b678f7979a42787b7304cc5dae546c9dcb)) + ## [2.44.0](https://github.com/hypha-dao/dho-web-client/compare/v2.43.0...v2.44.0) (2024-03-27) diff --git a/package.json b/package.json index 8d14f1122..5c183025d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.0", + "version": "2.44.1", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From bce601479acadedd746e87c1049da74c5167d240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsenije=20Savi=C4=87?= Date: Wed, 27 Mar 2024 08:37:57 -0500 Subject: [PATCH 02/65] fix(actions): line --- src/store/dao/actions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js index 27d265fa9..c679c750d 100644 --- a/src/store/dao/actions.js +++ b/src/store/dao/actions.js @@ -36,7 +36,6 @@ export const createDAO = async function (context, { data, isDraft }) { { label: 'voting_alignment_x100', value: ['int64', data?.votingAlignmentPercent] }, { label: 'voting_quorum_x100', value: ['int64', data?.votingQuorumPercent] }, - { label: 'voice_token_decay_period', value: ['int64', 604800] }, { label: 'voice_token_decay_per_period_x10M', value: ['int64', 100000] }, From b3c468138cd5fb748bffe66c946571e5404e6118 Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:38:37 +0300 Subject: [PATCH 03/65] chore(master): release 2.44.2 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75e4df9d5..8a6ff7ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.44.2](https://github.com/hypha-dao/dho-web-client/compare/v2.44.1...v2.44.2) (2024-03-27) + + +### Bug Fixes + +* **actions:** line ([bce6014](https://github.com/hypha-dao/dho-web-client/commit/bce601479acadedd746e87c1049da74c5167d240)) + ## [2.44.1](https://github.com/hypha-dao/dho-web-client/compare/v2.44.0...v2.44.1) (2024-03-27) diff --git a/package.json b/package.json index 5c183025d..2228dd1de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.1", + "version": "2.44.2", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From df31f978709a19d402164557a9d20915c990f4fa Mon Sep 17 00:00:00 2001 From: Nikolaus Heger Date: Wed, 3 Apr 2024 21:28:30 +0800 Subject: [PATCH 04/65] fix(language): replace USD with cash (#2603) --- src/components/archetypes/archetype-radio.vue | 2 +- src/locales/en.json | 14 ++++++------ src/locales/es.json | 6 ++--- src/locales/fr.json | 6 ++--- src/locales/ko.json | 12 +++++----- src/pages/proposals/create/config.json | 22 +++++++++---------- .../proposals/create/config_backup_mvp.json | 4 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/components/archetypes/archetype-radio.vue b/src/components/archetypes/archetype-radio.vue index b6cd0b38d..91d63abf9 100644 --- a/src/components/archetypes/archetype-radio.vue +++ b/src/components/archetypes/archetype-radio.vue @@ -67,7 +67,7 @@ export default { button-radio.q-py-xs.q-px-xs( :iconText="salaryBucket(archetype)" :title="title(archetype)" - :description="`${salary(archetype).toLocaleString()} USD Equivalent / Year, Minimum Deferred ${minDeferred(archetype)}%`" + :description="`${salary(archetype).toLocaleString()} cash Equivalent / Year, Minimum Deferred ${minDeferred(archetype)}%`" :selected="selected" @click="selectArchetype" ) diff --git a/src/locales/en.json b/src/locales/en.json index 885d8ad32..0b3993a12 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1782,16 +1782,16 @@ }, "steppayout":{ "payout":"Payout", - "pleaseEnterTheUSDEquivalentAnd1":"Please enter the USD equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD.", - "pleaseEnterTheUsd":"Please enter the HUSD amount (i.e. USD equivalent) for your reward. You can use the slider to select the reward percentage you will be deferring.", - "typeTheAmountOfUsd":"Type the USD equivalent", + "pleaseEnterTheUSDEquivalentAnd1":"Please enter the cash equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD.", + "pleaseEnterTheUsd":"Please enter the HUSD amount (i.e. cash equivalent) for your reward. You can use the slider to select the reward percentage you will be deferring.", + "typeTheAmountOfUsd":"Type the cash equivalent", "commitmentMustBeGreater":"Commitment must be greater than or equal to the role configuration. Role value for min commitment is", "defferedMustBeGreater":"Due to the role setup you’ll have to choose a greater percentage to continue", "salaryCompensationForOneYear":"Reward for one year ( ${value} equivalent)", - "salaryCompensationForOneYearUsd":"Reward for one year ( ${value} ) USD equivalent", + "salaryCompensationForOneYearUsd":"Reward for one year ( ${value} ) cash equivalent", "compensation":"Reward Calculation", "compensation1":"Reward", - "pleaseEnterTheUSD":"Please enter the USD equivalent for your reward. Moving the second slider will let you select your token percentage (utility vs payout).", + "pleaseEnterTheUSD":"Please enter the cash equivalent for your reward. Moving the second slider will let you select your token percentage (utility vs payout).", "belowYouCanSeeTheActual":"The calculator will compute the token numbers when you adjust the sliders.", "compensationForOnePeriod":"Reward for one period", "compensationForOneCycle":"Reward for one cycle", @@ -2150,13 +2150,13 @@ "cashCoefficient":"Cash Coefficient", "payout":"Payout", "compensation":"Manage your reward", - "pleaseEnterTheUSDEquivalentAnd":"Please enter the USD equivalent (i.e. HUSD amount) for your reward. Moving the slider will let you select your token percentage (utility vs payout). This way, you can decide the percentage of utility vs payout tokens to receive.", + "pleaseEnterTheUSDEquivalentAnd":"Please enter the cash equivalent (i.e. HUSD amount) for your reward. Moving the slider will let you select your token percentage (utility vs payout). This way, you can decide the percentage of utility vs payout tokens to receive.", "belowYouCanSeeTheActual":"Below you can see the actual breakdown of the reward in HVOICE, HYPHA and HUSD", "typeThePayoutTitle":"Type the payout title", "typeThePayoutDescription":"Type the payout description", "attachments":"Attachments", "clickToAddFile":"Click to add file", - "totalUSDEquivalent":"Total USD Equivalent", + "totalUSDEquivalent":"Total cash Equivalent", "chooseTheDeferredAmount":"Choose token percentage (utility vs payout)", "customCompensation":"Custom compensation", "cashToken":"Payout Token", diff --git a/src/locales/es.json b/src/locales/es.json index 1b165e3bc..8ae302c9b 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -1776,7 +1776,7 @@ }, "steppayout": { "payout": "Pagar", - "pleaseEnterTheUSDEquivalentAnd1": "Ingrese el equivalente en USD y el porcentaje de aplazamiento para esta contribución; cuanto más posponga a una fecha posterior, mayor será el bono (consulte el cálculo del salario real a continuación o use nuestra calculadora). ", + "pleaseEnterTheUSDEquivalentAnd1": "Ingrese el equivalente en cash y el porcentaje de aplazamiento para esta contribución; cuanto más posponga a una fecha posterior, mayor será el bono (consulte el cálculo del salario real a continuación o use nuestra calculadora). ", "pleaseEnterTheUsd": "Ingrese el monto de HUSD (es decir, el equivalente en USD) para su recompensa. ", "typeTheAmountOfUsd": "Escriba el equivalente en USD", "commitmentMustBeGreater": "El compromiso debe ser mayor o igual a la configuración del rol. ", @@ -1785,7 +1785,7 @@ "salaryCompensationForOneYearUsd": "Recompensa por un año (${value}) equivalente en USD", "compensation": "Cálculo de recompensa", "compensation1": "Premio", - "pleaseEnterTheUSD": "Ingrese el equivalente en USD de su recompensa. ", + "pleaseEnterTheUSD": "Ingrese el equivalente en cash de su recompensa. ", "belowYouCanSeeTheActual": "La calculadora calculará los números de los tokens cuando ajuste los controles deslizantes.", "compensationForOnePeriod": "Recompensa por un período", "compensationForOneCycle": "Recompensa por un ciclo", @@ -2139,7 +2139,7 @@ "cashCoefficient": "Coeficiente de efectivo", "payout": "Pagar", "compensation": "Gestiona tu recompensa", - "pleaseEnterTheUSDEquivalentAnd": "Ingrese el equivalente en USD (es decir, el monto en HUSD) de su recompensa. ", + "pleaseEnterTheUSDEquivalentAnd": "Ingrese el equivalente en cash (es decir, el monto en HUSD) de su recompensa. ", "belowYouCanSeeTheActual": "A continuación puede ver el desglose real de la recompensa en HVOICE, HYPHA y HUSD.", "typeThePayoutTitle": "Escribe el título del pago", "typeThePayoutDescription": "Escribe la descripción del pago", diff --git a/src/locales/fr.json b/src/locales/fr.json index 57b6fa6f6..d2a299bde 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -1781,7 +1781,7 @@ }, "steppayout": { "payout": "Paiement", - "pleaseEnterTheUSDEquivalentAnd1": "Veuillez saisir l'équivalent en USD et le pourcentage de report pour cette contribution – plus vous reportez à une date ultérieure, plus le bonus sera élevé (voir le calcul du salaire réel ci-dessous ou utilisez notre calculateur). ", + "pleaseEnterTheUSDEquivalentAnd1": "Veuillez saisir l'équivalent en cash et le pourcentage de report pour cette contribution – plus vous reportez à une date ultérieure, plus le bonus sera élevé (voir le calcul du salaire réel ci-dessous ou utilisez notre calculateur). ", "pleaseEnterTheUsd": "Veuillez saisir le montant en HUSD (c'est-à-dire l'équivalent en USD) de votre récompense. ", "typeTheAmountOfUsd": "Tapez l'équivalent en USD", "commitmentMustBeGreater": "L'engagement doit être supérieur ou égal à la configuration du rôle. ", @@ -1790,7 +1790,7 @@ "salaryCompensationForOneYearUsd": "Récompense d'un an (${value} ) équivalent en USD", "compensation": "Calcul des récompenses", "compensation1": "Récompense", - "pleaseEnterTheUSD": "Veuillez saisir l'équivalent en USD de votre récompense. ", + "pleaseEnterTheUSD": "Veuillez saisir l'équivalent en cash de votre récompense. ", "belowYouCanSeeTheActual": "La calculatrice calculera les numéros de jetons lorsque vous ajusterez les curseurs.", "compensationForOnePeriod": "Récompense pour une période", "compensationForOneCycle": "Récompense pour un cycle", @@ -2149,7 +2149,7 @@ "cashCoefficient": "Coefficient de trésorerie", "payout": "Paiement", "compensation": "Gérez votre récompense", - "pleaseEnterTheUSDEquivalentAnd": "Veuillez saisir l'équivalent en USD (c'est-à-dire le montant en HUSD) de votre récompense. ", + "pleaseEnterTheUSDEquivalentAnd": "Veuillez saisir l'équivalent en cash (c'est-à-dire le montant en HUSD) de votre récompense. ", "belowYouCanSeeTheActual": "Ci-dessous, vous pouvez voir la répartition réelle de la récompense en HVOICE, HYPHA et HUSD.", "typeThePayoutTitle": "Tapez le titre du paiement", "typeThePayoutDescription": "Tapez la description du paiement", diff --git a/src/locales/ko.json b/src/locales/ko.json index b44e49b5b..035724ed5 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1776,16 +1776,16 @@ }, "steppayout": { "payout": "지불금", - "pleaseEnterTheUSDEquivalentAnd1": "이 기여에 대한 USD 상당 금액과 이연 %를 입력하십시오. 나중에 연기할수록 보너스가 높아집니다(아래 실제 급여 계산을 참조하거나 당사 계산기를 사용하십시오). ", - "pleaseEnterTheUsd": "보상을 받을 HUSD 금액(예: USD 상당)을 입력하세요. ", + "pleaseEnterTheUSDEquivalentAnd1": "이 기여에 대한 cash 상당 금액과 이연 %를 입력하십시오. 나중에 연기할수록 보너스가 높아집니다(아래 실제 급여 계산을 참조하거나 당사 계산기를 사용하십시오). ", + "pleaseEnterTheUsd": "보상을 받을 HUSD 금액(예: cash 상당)을 입력하세요. ", "typeTheAmountOfUsd": "해당 USD를 입력하세요.", "commitmentMustBeGreater": "약정은 역할 구성보다 크거나 같아야 합니다. ", "defferedMustBeGreater": "역할 설정으로 인해 계속하려면 더 높은 비율을 선택해야 합니다.", "salaryCompensationForOneYear": "1년 동안의 보상(${value} 상당)", - "salaryCompensationForOneYearUsd": "1년 동안의 보상( ${value} ) USD 상당", + "salaryCompensationForOneYearUsd": "1년 동안의 보상( ${value} ) cash 상당", "compensation": "보상 계산", "compensation1": "보상", - "pleaseEnterTheUSD": "보상에 해당하는 USD 금액을 입력하세요. ", + "pleaseEnterTheUSD": "보상에 해당하는 cash 금액을 입력하세요. ", "belowYouCanSeeTheActual": "슬라이더를 조정할 때 계산기는 토큰 번호를 계산합니다.", "compensationForOnePeriod": "한 기간 동안 보상", "compensationForOneCycle": "한 사이클에 대한 보상", @@ -2139,13 +2139,13 @@ "cashCoefficient": "현금 계수", "payout": "지불금", "compensation": "보상을 관리하세요", - "pleaseEnterTheUSDEquivalentAnd": "보상에 해당하는 USD 금액(예: HUSD 금액)을 입력하세요. ", + "pleaseEnterTheUSDEquivalentAnd": "보상에 해당하는 cash 금액(예: HUSD 금액)을 입력하세요. ", "belowYouCanSeeTheActual": "아래에서 HVOICE, HYPHA 및 HUSD의 실제 보상 내역을 볼 수 있습니다.", "typeThePayoutTitle": "지불금 제목을 입력하세요", "typeThePayoutDescription": "지급 설명을 입력하세요.", "attachments": "첨부파일", "clickToAddFile": "파일을 추가하려면 클릭하세요.", - "totalUSDEquivalent": "총 USD 상당", + "totalUSDEquivalent": "총 cash 상당", "chooseTheDeferredAmount": "토큰 비율 선택(유틸리티 대 지불금)", "customCompensation": "맞춤형 보상", "cashToken": "지급 토큰", diff --git a/src/pages/proposals/create/config.json b/src/pages/proposals/create/config.json index 981db6f51..3736f55a4 100644 --- a/src/pages/proposals/create/config.json +++ b/src/pages/proposals/create/config.json @@ -123,7 +123,7 @@ "fields": { "stepCompensationTitle": { "label": "Compensation", - "description:":"Please enter the USD equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." + "description:":"Please enter the cash equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." }, "title": { "key": "title", @@ -145,7 +145,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -247,7 +247,7 @@ }, "stepCompensationTitle": { "label": "Choose your payout", - "description:":"Please enter the USD equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." + "description:":"Please enter the cash equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." }, "url": { "key": "url", @@ -263,7 +263,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -340,7 +340,7 @@ "stepCompensationTitle": { "label": "Compensation", - "description:":"Please enter the USD equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." + "description:":"Please enter the cash equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." }, "questType": { @@ -355,7 +355,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -482,7 +482,7 @@ "stepCompensationTitle": { "label": "Manage your salary", - "description": "Fields below display the minimum % commitment and % HYPHA tokens vs. HUSD tokens required for this role as well as the role capacity (how many people can be assigned to this role) and USD equivalent." + "description": "Fields below display the minimum % commitment and % HYPHA tokens vs. HUSD tokens required for this role as well as the role capacity (how many people can be assigned to this role) and cash equivalent." }, "commitment": { @@ -664,7 +664,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -771,7 +771,7 @@ }, "stepCompensationTitle": { "label": "Choose your payout", - "description:":"Please enter the USD equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." + "description:":"Please enter the cash equivalent and % deferral for this contribution – the more you defer to a later date, the higher the bonus will be (see actual salary calculation below or use our calculator). The bottom fields compute the actual payout in SEEDS, HVOICE, HYPHA and HUSD." }, "url": { "key": "url", @@ -787,7 +787,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -940,7 +940,7 @@ "fields": { "stepCompensationTitle": { "label": "Manage your salary", - "description": "Fields below display the minimum % commitment and % HYPHA tokens vs. HUSD tokens required for this role as well as the role capacity (how many people can be assigned to this role) and USD equivalent." + "description": "Fields below display the minimum % commitment and % HYPHA tokens vs. HUSD tokens required for this role as well as the role capacity (how many people can be assigned to this role) and cash equivalent." }, "peg": { "key": "peg", diff --git a/src/pages/proposals/create/config_backup_mvp.json b/src/pages/proposals/create/config_backup_mvp.json index 970b499a0..d1357e72a 100644 --- a/src/pages/proposals/create/config_backup_mvp.json +++ b/src/pages/proposals/create/config_backup_mvp.json @@ -69,7 +69,7 @@ "fields": { "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "deferred": { @@ -182,7 +182,7 @@ }, "usdAmount": { "key": "usdAmount", - "label": "Total USD Equivalent", + "label": "Total cash Equivalent", "type": "asset" }, "description": { From bd79b242b414f8118785501c6876a9715ccc36e1 Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:29:25 +0300 Subject: [PATCH 05/65] chore(master): release 2.44.3 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a6ff7ad7..48d01c3dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.44.3](https://github.com/hypha-dao/dho-web-client/compare/v2.44.2...v2.44.3) (2024-04-03) + + +### Bug Fixes + +* **language:** replace USD with cash ([#2603](https://github.com/hypha-dao/dho-web-client/issues/2603)) ([df31f97](https://github.com/hypha-dao/dho-web-client/commit/df31f978709a19d402164557a9d20915c990f4fa)) + ## [2.44.2](https://github.com/hypha-dao/dho-web-client/compare/v2.44.1...v2.44.2) (2024-03-27) diff --git a/package.json b/package.json index 2228dd1de..52cbbfb47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.2", + "version": "2.44.3", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From 5f06e99be918557eeb6a18446635c7c95a746314 Mon Sep 17 00:00:00 2001 From: Nikolaus Heger Date: Wed, 3 Apr 2024 23:00:43 +0800 Subject: [PATCH 06/65] fix(api): set transaction expiry to 5 minutes (#2606) --- src/boot/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot/api.js b/src/boot/api.js index e3ab8f077..4782f9f7b 100644 --- a/src/boot/api.js +++ b/src/boot/api.js @@ -23,7 +23,7 @@ const signTransaction = async function (actions, options = {}) { }, { blocksBehind: 3, - expireSeconds: 30, + expireSeconds: 300, ...options } ) @@ -35,7 +35,7 @@ const signTransaction = async function (actions, options = {}) { }, { blocksBehind: 3, - expireSeconds: 30 + expireSeconds: 300 } ) transactionId = result.transaction_id From 083a0f98dbd05c249a8ffa01bcea0528645eb18f Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:01:13 +0300 Subject: [PATCH 07/65] chore(master): release 2.44.4 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48d01c3dd..59b90c0e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.44.4](https://github.com/hypha-dao/dho-web-client/compare/v2.44.3...v2.44.4) (2024-04-03) + + +### Bug Fixes + +* **api:** set transaction expiry to 5 minutes ([#2606](https://github.com/hypha-dao/dho-web-client/issues/2606)) ([5f06e99](https://github.com/hypha-dao/dho-web-client/commit/5f06e99be918557eeb6a18446635c7c95a746314)) + ## [2.44.3](https://github.com/hypha-dao/dho-web-client/compare/v2.44.2...v2.44.3) (2024-04-03) diff --git a/package.json b/package.json index 52cbbfb47..156130d9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.3", + "version": "2.44.4", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From 4fb2d1106720ebbf0cd3476e838568504dedb394 Mon Sep 17 00:00:00 2001 From: arsenije Date: Thu, 4 Apr 2024 07:53:30 -0600 Subject: [PATCH 08/65] fix(options-archetypes): change query (#2608) --- .../proposals/create/OptionsArchetypes.vue | 120 +++++------------- 1 file changed, 34 insertions(+), 86 deletions(-) diff --git a/src/pages/proposals/create/OptionsArchetypes.vue b/src/pages/proposals/create/OptionsArchetypes.vue index cf2da97f6..32d7619e0 100644 --- a/src/pages/proposals/create/OptionsArchetypes.vue +++ b/src/pages/proposals/create/OptionsArchetypes.vue @@ -2,28 +2,20 @@ import { mapGetters } from 'vuex' import gql from 'graphql-tag' -const TIERS_QUERY = ` - querySalaryband( - filter: { - details_dao_i: { in: [0, $daoId] }, +const ASSIGMENT_OPTIONS = ` + getDao(docId: $daoId) { + docId + role(filter: {details_autoApprove_i: {eq: 1}}) { + id: docId + name: details_title_s } - ) { - id: docId - name: details_name_s - annualAmount: details_annualUsdSalary_a - minDeferred: details_minDeferredX100_i - } -` - -const ROLES_QUERY = ` - queryRole( - filter: { - details_dao_i: { eq: $daoId }, - details_autoApprove_i: { eq: 1 } + salaryband(filter: {system_defaultAsset_i: {eq: 1}}) { + id: docId + name: details_name_s + annualAmount: details_annualUsdSalary_a + minDeferred: details_minDeferredX100_i + system_defaultAsset_i } - ) { - id: docId - name: details_title_s } ` @@ -35,78 +27,33 @@ export default { apollo: { - tiers: { - query: gql`query TIERS($daoId: Int64!) { ${TIERS_QUERY} }`, - update: data => { - if (data?.querySalaryband.length > 1) { - const filteredTiers = data?.querySalaryband?.filter(tier => tier.name !== 'Founders') - return filteredTiers.map(level => ({ - label: level?.name, - value: { ...level } - })) - } else { - return data?.querySalaryband?.map(level => ({ - label: level?.name, - value: { ...level } - })) - } - }, + data: { + query: gql`query ASSIGMENT_OPTIONS($daoId: String!) { ${ASSIGMENT_OPTIONS} }`, + update: data => data?.getDao, skip () { return !this.selectedDao?.docId }, variables () { return { daoId: this.selectedDao.docId } }, - subscribeToMore: { - document: gql`subscription TIERS($daoId: Int64!) { ${TIERS_QUERY} }`, - skip () { return !this.selectedDao?.docId }, - variables () { return { daoId: this.selectedDao.docId } }, - updateQuery: (previousResult, { subscriptionData }) => { - if (!subscriptionData.data) { - return previousResult - } - if (!previousResult) { - return undefined - } - - return subscriptionData.data - } - } - }, - - archetypes: { - query: gql`query ROLES($daoId: Int64!) { ${ROLES_QUERY} }`, - update: data => { - if (data?.queryRole.length > 1) { - const filteredArchetypes = data?.queryRole?.filter(archetype => archetype.name !== 'Founders') - return filteredArchetypes.map(archetype => ({ - label: archetype?.name, - value: { ...archetype } - })) - } else { - return data?.queryRole?.map(archetype => ({ - label: archetype?.name, - value: { ...archetype } - })) - } - }, - skip () { return !this.selectedDao?.docId }, - variables () { return { daoId: this.selectedDao.docId } }, - subscribeToMore: { - document: gql`subscription ROLES($daoId: Int64!) { ${ROLES_QUERY} }`, - skip () { return !this.selectedDao?.docId }, - variables () { return { daoId: this.selectedDao.docId } }, - updateQuery: (previousResult, { subscriptionData }) => { - if (!subscriptionData.data) { - return previousResult - } - if (!previousResult) { - return undefined - } - - return subscriptionData.data - } + result ({ data }) { + this.archetypes = data?.getDao?.role?.map(archetype => ({ + label: archetype?.name, + value: { ...archetype } + })) + + this.tiers = data?.getDao?.salaryband?.map(level => ({ + label: level?.name, + value: { ...level } + })) } } }, + data () { + return { + archetypes: [], + tiers: [] + } + }, + computed: { ...mapGetters('dao', ['selectedDao']), @@ -136,10 +83,11 @@ export default { hasArchetypes () { return this.archetypes && this?.archetypes.length > 0 }, hasTiers () { return this.tiers && this?.tiers.length > 0 }, - isLoading () { return this.$apollo.queries.archetypes.loading && this.$apollo.queries.tiers.loading } + isLoading () { return this.$apollo.queries.data.loading } }, updated () { + console.log(JSON.stringify(this.archetypes)) if (this.archetype.value && this.tier.value) { this.$emit('select', null) } From 2a2aeb3405a2f4e292762c98c7dc7515f30a6069 Mon Sep 17 00:00:00 2001 From: arsenije Date: Thu, 4 Apr 2024 08:04:15 -0600 Subject: [PATCH 09/65] fix(step-payout): set tokens to zero if null (#2610) --- src/pages/proposals/create/StepPayout.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/proposals/create/StepPayout.vue b/src/pages/proposals/create/StepPayout.vue index 624ad00f1..905fd83d1 100644 --- a/src/pages/proposals/create/StepPayout.vue +++ b/src/pages/proposals/create/StepPayout.vue @@ -174,7 +174,7 @@ export default { }, set (value) { - this.$store.commit('proposals/setPeg', parseFloat(value)) + this.$store.commit('proposals/setPeg', parseFloat(value || 0)) } }, @@ -184,7 +184,7 @@ export default { }, set (value) { - this.$store.commit('proposals/setReward', parseFloat(value)) + this.$store.commit('proposals/setReward', parseFloat(value || 0)) } }, @@ -194,7 +194,7 @@ export default { }, set (value) { - this.$store.commit('proposals/setVoice', parseFloat(value)) + this.$store.commit('proposals/setVoice', parseFloat(value || 0)) } }, From cde3c194342dd14335c8d3eb79830bee8c18eb11 Mon Sep 17 00:00:00 2001 From: arsenije Date: Thu, 4 Apr 2024 08:14:55 -0600 Subject: [PATCH 10/65] fix(configuration): add correct url param (#2611) --- src/layouts/Layout.vue | 4 ++-- src/pages/dho/Configuration.vue | 2 +- src/store/dao/mutations.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 103357723..a2b38b6a8 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -113,8 +113,8 @@ const ACTIVE_DAO_QUERY = ` settings_exploreBackgroundImage_s settings_exploreTitle_s settings_exploreParagraph_s - - settings_documentationURL_s + + settings_documentationUrl_s } memberAggregate { diff --git a/src/pages/dho/Configuration.vue b/src/pages/dho/Configuration.vue index 971b8127d..6951c2447 100644 --- a/src/pages/dho/Configuration.vue +++ b/src/pages/dho/Configuration.vue @@ -129,7 +129,7 @@ export default { name: this.daoSettings?.title ? this.daoSettings?.title : defaultSettings.title, url: this.daoSettings?.url ? this.daoSettings?.url : defaultSettings.url, purpose: this.daoSettings?.description ? this.daoSettings?.description : defaultSettings.description, - documentationUrl: this.daoSettings?.settings_documentationURL_s ? this.daoSettings?.settings_documentationURL_s : defaultSettings.documentationUrl, + documentationUrl: this.daoSettings?.documentationUrl ? this.daoSettings?.documentationUrl : defaultSettings.documentationUrl, primaryColor: this.daoSettings?.primaryColor ? this.daoSettings?.primaryColor : defaultSettings.primaryColor, secondaryColor: this.daoSettings?.secondaryColor ? this.daoSettings?.secondaryColor : defaultSettings.secondaryColor, diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js index e57c4c4db..5165aa80d 100644 --- a/src/store/dao/mutations.js +++ b/src/store/dao/mutations.js @@ -1,6 +1,7 @@ import { PLAN, PLAN_STATUS } from '~/const' const settingsMapper = (settings) => { + console.log(JSON.parse(JSON.stringify(settings?.settings_documentationUrl_s))) return { ...settings, name: settings?.settings_daoName_n, @@ -19,7 +20,7 @@ const settingsMapper = (settings) => { voiceToken: settings?.settings_voiceToken_a?.split(' ')[1], voiceTokenDecimals: settings?.settings_voiceToken_a?.split(' ')[0]?.split('.')[1].length, - documentationURL: settings?.settings_documentationURL_s, + documentationUrl: settings?.settings_documentationUrl_s, documentationButtonText: settings?.settings_documentationButtonText_s, socialChat: settings?.settings_socialChat_s, From d790ff6bc45e12325a33a573816b03f19263b67b Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:15:20 +0300 Subject: [PATCH 11/65] chore(master): release 2.44.5 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b90c0e8..69bd40dd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [2.44.5](https://github.com/hypha-dao/dho-web-client/compare/v2.44.4...v2.44.5) (2024-04-04) + + +### Bug Fixes + +* **configuration:** add correct url param ([#2611](https://github.com/hypha-dao/dho-web-client/issues/2611)) ([cde3c19](https://github.com/hypha-dao/dho-web-client/commit/cde3c194342dd14335c8d3eb79830bee8c18eb11)) +* **options-archetypes:** change query ([#2608](https://github.com/hypha-dao/dho-web-client/issues/2608)) ([4fb2d11](https://github.com/hypha-dao/dho-web-client/commit/4fb2d1106720ebbf0cd3476e838568504dedb394)) +* **step-payout:** set tokens to zero if null ([#2610](https://github.com/hypha-dao/dho-web-client/issues/2610)) ([2a2aeb3](https://github.com/hypha-dao/dho-web-client/commit/2a2aeb3405a2f4e292762c98c7dc7515f30a6069)) + ## [2.44.4](https://github.com/hypha-dao/dho-web-client/compare/v2.44.3...v2.44.4) (2024-04-03) diff --git a/package.json b/package.json index 156130d9d..ea7002ead 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.4", + "version": "2.44.5", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From 24e2320199858fdc1686efa7b58f396836b14215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsenije=20Savi=C4=87?= Date: Thu, 4 Apr 2024 09:28:24 -0500 Subject: [PATCH 12/65] fix: remove console.log --- src/pages/proposals/create/OptionsArchetypes.vue | 1 - src/store/dao/mutations.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/pages/proposals/create/OptionsArchetypes.vue b/src/pages/proposals/create/OptionsArchetypes.vue index 32d7619e0..ced1a1a47 100644 --- a/src/pages/proposals/create/OptionsArchetypes.vue +++ b/src/pages/proposals/create/OptionsArchetypes.vue @@ -87,7 +87,6 @@ export default { }, updated () { - console.log(JSON.stringify(this.archetypes)) if (this.archetype.value && this.tier.value) { this.$emit('select', null) } diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js index 5165aa80d..47004e5fa 100644 --- a/src/store/dao/mutations.js +++ b/src/store/dao/mutations.js @@ -1,7 +1,6 @@ import { PLAN, PLAN_STATUS } from '~/const' const settingsMapper = (settings) => { - console.log(JSON.parse(JSON.stringify(settings?.settings_documentationUrl_s))) return { ...settings, name: settings?.settings_daoName_n, From 25dbf1db349f8351ce4ba06ab3b2cb0a0518303d Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:28:58 +0300 Subject: [PATCH 13/65] chore(master): release 2.44.6 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69bd40dd5..5c60a2c87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.44.6](https://github.com/hypha-dao/dho-web-client/compare/v2.44.5...v2.44.6) (2024-04-04) + + +### Bug Fixes + +* remove console.log ([24e2320](https://github.com/hypha-dao/dho-web-client/commit/24e2320199858fdc1686efa7b58f396836b14215)) + ## [2.44.5](https://github.com/hypha-dao/dho-web-client/compare/v2.44.4...v2.44.5) (2024-04-04) diff --git a/package.json b/package.json index ea7002ead..70ef57cfe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.44.5", + "version": "2.44.6", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From b8713bf17976f07e7581042d21d3ec29cdbb7614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsenije=20Savi=C4=87?= Date: Mon, 22 Apr 2024 19:06:47 -0500 Subject: [PATCH 14/65] refactor: clean up the nav --- .../navigation/bottom-navigation.vue | 28 +++++++---- src/components/navigation/left-navigation.vue | 38 +++++++-------- .../navigation/navigation-header.vue | 4 +- src/components/organization/members.vue | 2 +- src/const.js | 10 ++-- src/layouts/MultiDhoLayout.vue | 2 +- src/locales/en.json | 18 ++++---- src/locales/es.json | 23 +++++----- src/locales/fr.json | 18 ++++---- src/locales/ko.json | 18 ++++---- src/locales/pt.json | 16 +++---- src/locales/sr.json | 19 ++++---- src/locales/zh.json | 18 ++++---- src/pages/dho/Home.vue | 6 +-- src/pages/proposals/ProposalCreate.vue | 4 +- src/pages/proposals/ProposalDetail.vue | 8 ++-- src/router/routes.js | 46 +++++++++---------- 17 files changed, 141 insertions(+), 137 deletions(-) diff --git a/src/components/navigation/bottom-navigation.vue b/src/components/navigation/bottom-navigation.vue index f139f7839..894d8baa4 100644 --- a/src/components/navigation/bottom-navigation.vue +++ b/src/components/navigation/bottom-navigation.vue @@ -1,15 +1,23 @@ @@ -170,15 +172,14 @@ export default { q-page.page-dashboard base-banner(:compact="!$q.screen.gt.sm" :split="$q.screen.gt.md" v-bind="welcomeBanner" v-if="isWelcomeBannerVisible") template(v-slot:buttons) - router-link(:to="{ name: 'treasury' }") - q-btn.q-px-lg.h-btn1(color="secondary" :label="$t('pages.dho.home.discoverMore')" no-caps rounded unelevated) + q-btn.q-px-lg.h-btn1(color="secondary" :label="$t('pages.dho.home.discoverMore')" no-caps rounded unelevated @click="openURL(daoSettings.settings_documentationUrl_s || 'https://help.hypha.earth/hc/2431449449')") section.q-mt-md.grid metric-link(:link="{ link: 'agreements', params: { type: 'badge' } }" :amount="activeAssignmentsCount || '...'" :style="{'grid-area': 'assignments'}" :title="$t('pages.dho.home.assignments')") metric-link(:link="{ link: 'organization/assets', params: { type: 'badge' } }" :amount="activeBadgesCount || '...'" :style="{'grid-area': 'badges'}" :title="$t('pages.dho.home.badges')") metric-link(:link="{ link: 'people', params: { type: 'badge' } }" :amount="activeMembersCount || '...'" :style="{'grid-area': 'members'}" :title="$t('pages.dho.home.members')") metric-link(:link="{ link: 'agreements', params: { type: 'badge' } }" :amount="activeProposalsCount || '...'" :style="{'grid-area': 'proposals'}" :title="$t('pages.dho.home.proposals')") members(:title="$t('pages.dho.home.members')" :members="daoMembers || []" :style="{'grid-area': 'new'}") - support-widget(:documentationButtonText="daoSettings.documentationButtonText" :documentationURL="daoSettings.documentationURL" :socialChat="daoSettings.socialChat" :style="{'grid-area': 'support'}") + support-widget(:documentationButtonText="daoSettings.documentationButtonText" :documentationURL="daoSettings.settings_documentationUrl_s || 'https://help.hypha.earth/hc/2431449449'" :socialChat="daoSettings.socialChat" :style="{'grid-area': 'support'}") how-it-works(:style="{'grid-area': 'how'}") section.q-mt-md circles-widget(:circles="circles" :title="$t('pages.dho.organization.daoCircles1')") diff --git a/src/pages/proposals/ProposalList.vue b/src/pages/proposals/ProposalList.vue index 564a62662..78d371ada 100644 --- a/src/pages/proposals/ProposalList.vue +++ b/src/pages/proposals/ProposalList.vue @@ -847,7 +847,7 @@ q-page.page-proposals base-banner(:compact="!$q.screen.gt.md" @onClose="hideProposalBanner" split="split" v-bind="banner" v-if="isShowingProposalBanner") template(v-slot:buttons) q-btn.q-px-lg.h-btn1(:to="{ name: 'proposal-create', params: { dhoname: daoSettings.url } }" color="secondary" :label="$t('pages.proposals.proposallist.createProposal')" no-caps rounded unelevated v-if="isMember") - a(:href="daoSettings.documentationURL" target="_blank") + a(:href="daoSettings.settings_documentationUrl_s || 'https://help.hypha.earth/hc/2431449449'" target="_blank") q-btn.q-px-lg.h-btn1(:class="{'bg-secondary': !isMember}" color="white" flat :label="$t('pages.proposals.proposallist.learnMore')" no-caps rounded) template(v-slot:right) .row From 117724294d3a87649be8437fc01054623ebb6dc2 Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Fri, 31 May 2024 10:57:42 +0200 Subject: [PATCH 43/65] chore(master): release 2.49.1 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7382ca750..6e3a7d414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.49.1](https://github.com/hypha-dao/dho-web-client/compare/v2.49.0...v2.49.1) (2024-05-31) + + +### Bug Fixes + +* **links:** documentation links ([#1301](https://github.com/hypha-dao/dho-web-client/issues/1301)) ([#2634](https://github.com/hypha-dao/dho-web-client/issues/2634)) ([843abf0](https://github.com/hypha-dao/dho-web-client/commit/843abf04c102158c8880140f79e52b0fb05e5a3c)) +* **localization:** incorrect translations ([#1303](https://github.com/hypha-dao/dho-web-client/issues/1303)) ([#2633](https://github.com/hypha-dao/dho-web-client/issues/2633)) ([0840d79](https://github.com/hypha-dao/dho-web-client/commit/0840d79e3118612fd5302fec258f48481d185f82)) +* **policy:** proposal voting widget ([#1315](https://github.com/hypha-dao/dho-web-client/issues/1315)) ([#2632](https://github.com/hypha-dao/dho-web-client/issues/2632)) ([5781de5](https://github.com/hypha-dao/dho-web-client/commit/5781de5aeb9bb2b3637a06e440fe061dfc2d9e97)) +* upvote election issues ([#2631](https://github.com/hypha-dao/dho-web-client/issues/2631)) ([32bf56c](https://github.com/hypha-dao/dho-web-client/commit/32bf56c52d4da4f52421d48a31a3660fa0740f23)) + ## [2.49.0](https://github.com/hypha-dao/dho-web-client/compare/v2.48.1...v2.49.0) (2024-05-29) diff --git a/package.json b/package.json index 6eebecb97..e5912fd3a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.49.0", + "version": "2.49.1", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From 285b2aa61bcde135ae84fe584c9820175d8067dc Mon Sep 17 00:00:00 2001 From: Nikolaus Heger Date: Tue, 4 Jun 2024 15:57:45 +0800 Subject: [PATCH 44/65] fix(proposal-list): proposal not loading (#DEV-1322) (#2640) --- src/pages/proposals/ProposalDetail.vue | 4 ---- src/store/dao/mutations.js | 2 +- yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/pages/proposals/ProposalDetail.vue b/src/pages/proposals/ProposalDetail.vue index ced89566f..7ba30c640 100644 --- a/src/pages/proposals/ProposalDetail.vue +++ b/src/pages/proposals/ProposalDetail.vue @@ -329,10 +329,6 @@ const PROPOSAL_QUERY = ` details_url_s - voteAggregate { - count - } - votetally { docId ... on VoteTally { diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js index 47004e5fa..0be9bcdeb 100644 --- a/src/store/dao/mutations.js +++ b/src/store/dao/mutations.js @@ -141,7 +141,7 @@ export const setPlan = (state, plan = {}) => { ...plan, name: (plan?.name || PLAN.FOUNDER).toLowerCase(), status: plan?.status || PLAN_STATUS.ACTIVE, - amountUSD: (plan?.price / 100) / (plan.interval === 'year' && plan.planType === 'SAAS' ? 12 : 1), + amountUSD: (plan?.price / 100) / (plan?.interval === 'year' && plan?.planType === 'SAAS' ? 12 : 1), coreMembersCount: plan?.coreMembersCount || 5, communityMembersCount: plan?.communityMembersCount || 0, currentCoreMembersCount: state?.meta?.memberCount || 0 diff --git a/yarn.lock b/yarn.lock index 598c524ca..be68edeba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3106,10 +3106,10 @@ resolved "https://registry.yarnpkg.com/@hypha-dao/ppp-common/-/ppp-common-1.0.0.tgz#73268c7972934d8dd72d30ebe6bfcb4c0b401004" integrity sha512-evhqU5+L5RWMCJcU/8ATqOet147T2pI5P0IMMN6DiKmMcI13lzKPqzwq2e4OyfAdq84Foe55ItbvOYs9uJ713g== -"@hypha-dao/ual-hypha@^1.0.13": - version "1.0.13" - resolved "https://registry.yarnpkg.com/@hypha-dao/ual-hypha/-/ual-hypha-1.0.13.tgz#111933a512a50d1e0361d4e8a619c2eda4e80f22" - integrity "sha1-ERkzpRKlDR4DYdTophnC7aToDyI= sha512-aTir7tS4xeg6/RfTiLjjRgn/msnLP/3JZMODz/D5BngNoZUYHYllT10wZAUlXqr709eVHXkzXIsHF9RGiE5ZFQ==" +"@hypha-dao/ual-hypha@^1.0.14": + version "1.0.14" + resolved "https://registry.yarnpkg.com/@hypha-dao/ual-hypha/-/ual-hypha-1.0.14.tgz#68879ab449092a8d2bad1ac0816977c834689353" + integrity sha512-3FV2qwqu/f+S2mKb7Fz1mNLzTl1hm1DyJvA84Gbq7gT0WSXPdL2vU+bc3N6eNVsbItoHBVQX5qZy79X7xD8pIw== dependencies: "@babel/core" "^7.21.4" "@babel/plugin-proposal-class-properties" "^7.16.7" From 24edf1252884d2a9da6b859c6da06daf03860b75 Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Tue, 4 Jun 2024 00:59:26 -0700 Subject: [PATCH 45/65] fix(links): broken links (#1306) (#2637) --- src/components/navigation/sidebar-news.vue | 4 ++-- src/components/organization/badge-assignments-widget.vue | 2 +- src/components/organization/badges-widget.vue | 2 +- src/components/organization/payouts-widget.vue | 2 +- src/components/organization/role-assignments-widget.vue | 2 +- src/components/profiles/voting-history.vue | 2 +- src/layouts/MultiDhoLayout.vue | 2 +- src/mixins/dao-routing.js | 2 +- src/pages/dho/Finflow.vue | 2 +- src/pages/proposals/ProposalHistory.vue | 2 +- src/pages/proposals/ProposalList.vue | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/navigation/sidebar-news.vue b/src/components/navigation/sidebar-news.vue index 882f6e592..90447fccd 100644 --- a/src/components/navigation/sidebar-news.vue +++ b/src/components/navigation/sidebar-news.vue @@ -39,9 +39,9 @@ export default { .h-b2 {{ $t('navigation.sidebar-news.niceToSee') }} .row.items-center.q-my-md .h-b2 {{ $t('navigation.sidebar-news.youCanVoteFor') }} - router-link(:to="`/${daoName}/proposals`") {{ $t('navigation.sidebar-news.proposals') }} + router-link(:to="`/${daoName}/agreements`") {{ $t('navigation.sidebar-news.proposals') }} | {{ $t('navigation.sidebar-news.searchFor') }} - router-link(:to="`/${daoName}/members`") {{ $t('navigation.sidebar-news.members') }} + router-link(:to="`/${daoName}/people`") {{ $t('navigation.sidebar-news.members') }} | {{ $t('navigation.sidebar-news.andFindOut') }} router-link(:to="`/${daoName}/organization`") {{ $t('navigation.sidebar-news.organization') }} | {{ $t('navigation.sidebar-news.tick') }} diff --git a/src/components/organization/badge-assignments-widget.vue b/src/components/organization/badge-assignments-widget.vue index 53c304d68..ba41783bb 100644 --- a/src/components/organization/badge-assignments-widget.vue +++ b/src/components/organization/badge-assignments-widget.vue @@ -30,5 +30,5 @@ widget.full-width(:title="$t('organization.badge-assignments-widget.badgeAssignm empty-widget-label(sectionTitle="Badge assignments") .row(v-else v-for="assignment in assignments") .col-12 - badge-assignment-card(v-bind="assignment" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/proposals/${assignment.docId}` })") + badge-assignment-card(v-bind="assignment" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/agreements/${assignment.docId}` })") diff --git a/src/components/organization/badges-widget.vue b/src/components/organization/badges-widget.vue index 931568250..ab204a133 100644 --- a/src/components/organization/badges-widget.vue +++ b/src/components/organization/badges-widget.vue @@ -34,7 +34,7 @@ export default { onClick (docId) { !this.fromProfile ? this.$router.push({ path: `/${this.$route.params.dhoname}/organization/assets/badge/${docId}` }) - : this.$router.push({ path: `/${this.$route.params.dhoname}/proposals/${docId}` }) + : this.$router.push({ path: `/${this.$route.params.dhoname}/agreements/${docId}` }) } } } diff --git a/src/components/organization/payouts-widget.vue b/src/components/organization/payouts-widget.vue index 1e00f1d20..6f9798669 100644 --- a/src/components/organization/payouts-widget.vue +++ b/src/components/organization/payouts-widget.vue @@ -31,6 +31,6 @@ widget.full-width(:title="$t('organization.payouts-widget.passedGenericContribut empty-widget-label(sectionTitle="Passed Generic Contributions") .row(v-else v-for="payout in payouts") .col-12 - Payout-card(v-bind="payout" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/proposals/${payout.docId}` })") + Payout-card(v-bind="payout" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/agreements/${payout.docId}` })") diff --git a/src/components/organization/role-assignments-widget.vue b/src/components/organization/role-assignments-widget.vue index ad5e376ea..70f70b70c 100644 --- a/src/components/organization/role-assignments-widget.vue +++ b/src/components/organization/role-assignments-widget.vue @@ -31,6 +31,6 @@ widget.full-width(:title="$t('organization.role-assignments-widget.activeRoleAss empty-widget-label(:sectionTitle="$t('organization.role-assignments-widget.activeRoleAssignments')") .row(v-else v-for="assignment in assignments") .col-12 - role-assignment-card(v-bind="assignment" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/proposals/${assignment.docId}` })") + role-assignment-card(v-bind="assignment" :compact="compact" @click.native="$router.push({ path: `/${$route.params.dhoname}/agreements/${assignment.docId}` })") diff --git a/src/components/profiles/voting-history.vue b/src/components/profiles/voting-history.vue index 5e07319a3..e2a9de8b2 100644 --- a/src/components/profiles/voting-history.vue +++ b/src/components/profiles/voting-history.vue @@ -41,7 +41,7 @@ export default { }, onVoteClick (vote) { - this.$router.push(`/${vote.daoName}/proposals/${vote.proposalId}`) + this.$router.push(`/${vote.daoName}/agreements/${vote.proposalId}`) } } } diff --git a/src/layouts/MultiDhoLayout.vue b/src/layouts/MultiDhoLayout.vue index 292486787..76a2017ef 100644 --- a/src/layouts/MultiDhoLayout.vue +++ b/src/layouts/MultiDhoLayout.vue @@ -758,7 +758,7 @@ export default { goToProposal (notification) { const proposal = JSON.parse(notification.content).proposalId if (proposal) { - this.$router.push({ path: `/${this.selectedDao?.name}/proposals/${proposal}` }) + this.$router.push({ path: `/${this.selectedDao?.name}/agreements/${proposal}` }) } } } diff --git a/src/mixins/dao-routing.js b/src/mixins/dao-routing.js index a65dfee20..e85d817ec 100644 --- a/src/mixins/dao-routing.js +++ b/src/mixins/dao-routing.js @@ -8,7 +8,7 @@ export const daoRouting = { this.$router.push(`/${this.daoSettings.url}/${route}`) }, routeToProposal (proposalId) { - this.$router.push(`/${this.daoSettings.url}/proposals/${proposalId}`) + this.$router.push(`/${this.daoSettings.url}/agreements/${proposalId}`) } } } diff --git a/src/pages/dho/Finflow.vue b/src/pages/dho/Finflow.vue index a9ec60130..2e09cca0c 100644 --- a/src/pages/dho/Finflow.vue +++ b/src/pages/dho/Finflow.vue @@ -242,7 +242,7 @@ export default { } }, onRowClick (evt, row) { - this.$router.push(`/${this.$route.params.dhoname}/proposals/${row.docId}`) + this.$router.push(`/${this.$route.params.dhoname}/agreements/${row.docId}`) } } } diff --git a/src/pages/proposals/ProposalHistory.vue b/src/pages/proposals/ProposalHistory.vue index dc1bd871f..576bf75e9 100644 --- a/src/pages/proposals/ProposalHistory.vue +++ b/src/pages/proposals/ProposalHistory.vue @@ -713,7 +713,7 @@ export default { q-page.page-proposals .row.q-py-md .col-12.col-lg-9 - base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!isLoading && !hasProposals" :title="$t('pages.proposals.proposalhistory.noProposals')" 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'}]") + base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!isLoading && !hasProposals" :title="$t('pages.proposals.proposalhistory.noProposals')" 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}/agreements/create`), disable: !isMember, disableTooltip: 'You must be a member'}]") base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!isLoading && !filteredProposals.length && hasProposals" :title="$t('pages.proposals.proposalhistory.oopsNothingCould')" subtitle="Try a different filter or another keyword" icon="far fa-check-square" :actionButtons="[{label: 'Reset filter(s)', color: 'primary', onClick: () => this.$refs.filter.resetFilters() }]") proposal-list.q-mb-xxxl(:username="account" :proposals="filteredProposals" :supply="supply" :view="$q.screen.gt.md ? view: 'card'" :compact="!$q.screen.gt.md") .row.justify-center.q-mb-xxxl(v-if="$apollo.loading") diff --git a/src/pages/proposals/ProposalList.vue b/src/pages/proposals/ProposalList.vue index 78d371ada..c6c955029 100644 --- a/src/pages/proposals/ProposalList.vue +++ b/src/pages/proposals/ProposalList.vue @@ -836,7 +836,7 @@ export default { this.$apollo.queries.archivedProposals?.refetch() }, handleCreateNewProposal() { - this.$router.push(`/${this.daoSettings.url}/proposals/create`) + this.$router.push(`/${this.daoSettings.url}/agreements/create`) } } } @@ -857,7 +857,7 @@ q-page.page-proposals button-radio.full-height(icon="fas fa-users" :title="$t('pages.proposals.proposallist.quorum')" :subtitle="quorumTitle" :description="$t('pages.proposals.proposallist.isTheMinimumRequiredPercentageOfTotal')" opacity="opacity" primary="primary") .row.q-py-md(v-if="$q.screen.gt.md") .col-12.col-lg-9 - base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!filteredStagedProposals?.length && !filteredProposals?.length && !hasProposals" :title="$t('pages.proposals.proposallist.noProposals')" 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'}]") + base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!filteredStagedProposals?.length && !filteredProposals?.length && !hasProposals" :title="$t('pages.proposals.proposallist.noProposals')" 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}/agreements/create`), disable: !isMember, disableTooltip: 'You must be a member'}]") base-placeholder.q-mr-sm(:compact="!$q.screen.gt.md" v-if="!filteredProposals?.length && !filteredStagedProposals?.length && hasProposals" :title="$t('pages.proposals.proposallist.oopsNothingCould')" subtitle="Try a different filter or another keyword" icon="far fa-check-square" :actionButtons="[{label: 'Reset filter(s)', color: 'primary', onClick: () => this.$refs.filter.resetFilters() }]") .row.justify-center.q-my-md(v-if="$apollo.loading") loading-spinner(color="primary" size="72px") From 2ce40f87f6527f404a88b0b5bdaa52bba1ae61db Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Tue, 4 Jun 2024 01:00:16 -0700 Subject: [PATCH 46/65] fix(support): links issues (#1317) (#2639) --- .env.example | 2 +- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/deploy-staging.yml | 2 +- .gitlab-ci.yml | 4 ++-- src/pages/support/Support.vue | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index b50ed5ee9..fc3068a84 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,7 @@ DAO_CONTRACT=dao.hypha ACCOUNT_API_URL=https://opqeierg9e.execute-api.us-east-1.amazonaws.com/dev ACCOUNT_API_KEY=BQoDqqyTpG1zriwiwwBZ62nZnVcCI9KQ1j1qUSJc -BLOCKCHAIN_EXPLORER=https://telos-test.bloks.io +BLOCKCHAIN_EXPLORER=https://explorer.telos.net BLOCKCHAIN_EXPLORER_BTC=https://www.blockchain.com/btc/tx/ BLOCKCHAIN_EXPLORER_ETH=https://etherscan.io/tx/ BLOCKCHAIN_EXPLORER_EOS=https://bloks.io/transaction/ diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index af6fba777..e9bf55991 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -33,7 +33,7 @@ jobs: HVOICE_TOKEN_CONTRACT: 'voice.hypha' ACCOUNT_API_URL: 'https://tb3nnn0qa9.execute-api.us-east-1.amazonaws.com/prod' ACCOUNT_API_KEY: ${{ secrets.PROD_ACCOUNT_API_KEY }} - BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io' + BLOCKCHAIN_EXPLORER: 'https://explorer.telos.net' BLOCKCHAIN_EXPLORER_BTC: 'https://www.blockchain.com/btc/tx/' BLOCKCHAIN_EXPLORER_ETH: 'https://etherscan.io/tx/' BLOCKCHAIN_EXPLORER_EOS: 'https://bloks.io/transaction/' diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index af3b40bdc..45b80c09c 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -37,7 +37,7 @@ jobs: HVOICE_TOKEN_CONTRACT: 'voice.hypha' ACCOUNT_API_URL: 'https://tb3nnn0qa9.execute-api.us-east-1.amazonaws.com/prod' ACCOUNT_API_KEY: ${{ secrets.PROD_ACCOUNT_API_KEY }} - BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io' + BLOCKCHAIN_EXPLORER: 'https://explorer.telos.net' BLOCKCHAIN_EXPLORER_BTC: 'https://www.blockchain.com/btc/tx/' BLOCKCHAIN_EXPLORER_ETH: 'https://etherscan.io/tx/' BLOCKCHAIN_EXPLORER_EOS: 'https://bloks.io/transaction/' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d5556dc3..5a7a72c96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ build_prod: NETWORK_CHAIN_ID: '4667b205c6838ef70ff7988f6e8257e8be0e1284a2f59699054a018f743b1d11' DAO_CONTRACT: 'dao.hypha' ACCOUNT_API_URL: 'https://tb3nnn0qa9.execute-api.us-east-1.amazonaws.com/prod' - BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io' + BLOCKCHAIN_EXPLORER: 'https://explorer.telos.net' PPP_ENV: 'prod' SENTRY_DSN: 'https://6fa219bfb2ed453fb5032d6ce1b83fc9@sentry.io/1884471' cache: @@ -103,7 +103,7 @@ build_dho: NETWORK_CHAIN_ID: '4667b205c6838ef70ff7988f6e8257e8be0e1284a2f59699054a018f743b1d11' DAO_CONTRACT: 'dao.hypha' ACCOUNT_API_URL: 'https://tb3nnn0qa9.execute-api.us-east-1.amazonaws.com/prod' - BLOCKCHAIN_EXPLORER: 'https://telos.bloks.io' + BLOCKCHAIN_EXPLORER: 'https://explorer.telos.net' PPP_ENV: 'prod' SENTRY_DSN: 'https://6fa219bfb2ed453fb5032d6ce1b83fc9@sentry.io/1884471' : 'https://notepad.diglife.coop/6w_69K_8QLSbzNaYcDWtHw?view ' diff --git a/src/pages/support/Support.vue b/src/pages/support/Support.vue index 5d4be1b8d..bfcee701c 100644 --- a/src/pages/support/Support.vue +++ b/src/pages/support/Support.vue @@ -75,7 +75,7 @@ q-page.page-support widget(:title="$t('pages.support.support.doYouHaveQuestions')") .text-body2.q-mt-sm.text-weight-thin.text-grey-7.q-my-md {{ $t('pages.support.support.findOurFull') }} - q-btn.q-px-xl.q-mt-xl(rounded no-caps color="primary" type="a" :href="daoSettings.documentationURL" target="_blank") {{ $t('pages.support.support.openWiki') }} + q-btn.q-px-xl.q-mt-xl(rounded no-caps color="primary" type="a" :href="daoSettings.settings_documentationUrl_s || 'https://help.hypha.earth/hc/2431449449'" target="_blank") {{ $t('pages.support.support.openWiki') }} widget.q-mt-md(:title="$t('pages.support.support.version')") .text-body2.q-mt-sm.text-weight-thin.text-grey-7.q-my-md {{ appVersion }} From 9ad205bbac5d8476e6dc72fb37c82aa9e428303b Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Tue, 4 Jun 2024 01:01:04 -0700 Subject: [PATCH 47/65] fix(settings): utility token supply (#1291) (#2638) --- src/store/dao/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js index 2d64b149b..b95b565f1 100644 --- a/src/store/dao/actions.js +++ b/src/store/dao/actions.js @@ -1069,7 +1069,7 @@ export const createTokens = async function ({ state, rootState }, data) { { label: 'content_group_label', value: ['string', 'reward_details'] }, { label: 'reward_token_name', value: ['string', data?.utilityName] }, { label: 'reward_token', value: ['asset', `${parseFloat(1).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, - { label: 'reward_token_max_supply', value: ['asset', `${parseFloat(-1).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, + { label: 'reward_token_max_supply', value: ['asset', `${parseFloat(data?.utilityAmount).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, { label: 'reward_to_peg_ratio', value: ['asset', `${parseFloat(1).toFixed(data?.treasuryDigits)} ${data?.treasurySymbol}`] }, { label: 'utility_token_multiplier', value: ['int64', data?.utilityTokenMultiplier * 100] } ], From 3ac44b52397b6705548bd4ec7489ada894a89e8a Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Tue, 4 Jun 2024 01:01:32 -0700 Subject: [PATCH 48/65] fix(settings): settings vote duration period (#1307) (#2636) --- src/components/form/custom-period-input.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/form/custom-period-input.vue b/src/components/form/custom-period-input.vue index 6a687b989..b1901ba8d 100644 --- a/src/components/form/custom-period-input.vue +++ b/src/components/form/custom-period-input.vue @@ -60,7 +60,6 @@ export default { if (this.period === 'weeks') { value = value * 7 * 24 * 60 * 60 } if (this.period === 'months') { value = value * 2628000 } } - this.$emit('input', value) } @@ -72,11 +71,22 @@ export default { watch: { value: { handler: function (value) { - if (value && !this.period) { + if (value) { this.period = secondsToInterval(this.value).period } }, immediate: true + }, + period: { + handler: function (value) { + let time = '' + if (this.period === 'minutes') { time = (this.valueFormated * 60) } + if (this.period === 'hours') { time = (this.valueFormated * 60) * 60 } + if (this.period === 'days') { time = this.valueFormated * 24 * 60 * 60 } + if (this.period === 'weeks') { time = this.valueFormated * 7 * 24 * 60 * 60 } + if (this.period === 'months') { time = this.valueFormated * 2628000 } + this.$emit('input', time) + } } } @@ -102,7 +112,7 @@ div.custom-period-input q-item-section q-item-label {{ $t('periods.minutes') }} - q-item(clickable v-close-popup @click="period = 'minutes'") + q-item(clickable v-close-popup @click="period = 'hours'") q-item-section q-item-label {{ $t('periods.hours') }} From 192bf1daecfdb0002ead7923e38c54971d960ec1 Mon Sep 17 00:00:00 2001 From: Alex <4747536+Alex-IS@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:02:00 +0200 Subject: [PATCH 49/65] chore(master): release 2.49.2 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e3a7d414..276506694 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [2.49.2](https://github.com/hypha-dao/dho-web-client/compare/v2.49.1...v2.49.2) (2024-06-04) + + +### Bug Fixes + +* **links:** broken links ([#1306](https://github.com/hypha-dao/dho-web-client/issues/1306)) ([#2637](https://github.com/hypha-dao/dho-web-client/issues/2637)) ([24edf12](https://github.com/hypha-dao/dho-web-client/commit/24edf1252884d2a9da6b859c6da06daf03860b75)) +* **proposal-list:** proposal not loading (#DEV-1322) ([#2640](https://github.com/hypha-dao/dho-web-client/issues/2640)) ([285b2aa](https://github.com/hypha-dao/dho-web-client/commit/285b2aa61bcde135ae84fe584c9820175d8067dc)) +* **settings:** settings vote duration period ([#1307](https://github.com/hypha-dao/dho-web-client/issues/1307)) ([#2636](https://github.com/hypha-dao/dho-web-client/issues/2636)) ([3ac44b5](https://github.com/hypha-dao/dho-web-client/commit/3ac44b52397b6705548bd4ec7489ada894a89e8a)) +* **settings:** utility token supply ([#1291](https://github.com/hypha-dao/dho-web-client/issues/1291)) ([#2638](https://github.com/hypha-dao/dho-web-client/issues/2638)) ([9ad205b](https://github.com/hypha-dao/dho-web-client/commit/9ad205bbac5d8476e6dc72fb37c82aa9e428303b)) +* **support:** links issues ([#1317](https://github.com/hypha-dao/dho-web-client/issues/1317)) ([#2639](https://github.com/hypha-dao/dho-web-client/issues/2639)) ([2ce40f8](https://github.com/hypha-dao/dho-web-client/commit/2ce40f87f6527f404a88b0b5bdaa52bba1ae61db)) + ## [2.49.1](https://github.com/hypha-dao/dho-web-client/compare/v2.49.0...v2.49.1) (2024-05-31) diff --git a/package.json b/package.json index e5912fd3a..aa20b2237 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dho-web-client", - "version": "2.49.1", + "version": "2.49.2", "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)", "productName": "Hypha DHO", "author": "Max ", From d54dad1a51d1f0e4b79e42bdc63bd7cb8ef44404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsenije=20Savi=C4=87?= Date: Fri, 14 Jun 2024 10:34:43 +0200 Subject: [PATCH 50/65] fix(action): add correct value for reward_token_max_supply --- src/store/dao/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/dao/actions.js b/src/store/dao/actions.js index b95b565f1..46a1afc21 100644 --- a/src/store/dao/actions.js +++ b/src/store/dao/actions.js @@ -1069,7 +1069,7 @@ export const createTokens = async function ({ state, rootState }, data) { { label: 'content_group_label', value: ['string', 'reward_details'] }, { label: 'reward_token_name', value: ['string', data?.utilityName] }, { label: 'reward_token', value: ['asset', `${parseFloat(1).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, - { label: 'reward_token_max_supply', value: ['asset', `${parseFloat(data?.utilityAmount).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, + { label: 'reward_token_max_supply', value: ['asset', `${parseFloat(data?.utilityAmount ? data?.utilityAmount : -1).toFixed(data?.utilityDigits)} ${data?.utilitySymbol}`] }, { label: 'reward_to_peg_ratio', value: ['asset', `${parseFloat(1).toFixed(data?.treasuryDigits)} ${data?.treasurySymbol}`] }, { label: 'utility_token_multiplier', value: ['int64', data?.utilityTokenMultiplier * 100] } ], From 78c6e3b5dc079f8b335302247da4a202bb2d84a4 Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Thu, 20 Jun 2024 08:57:20 +0300 Subject: [PATCH 51/65] fix(circle-card): go-to-circle button link (#1314) --- src/components/organization/circle-card.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/organization/circle-card.vue b/src/components/organization/circle-card.vue index acb31a9b1..09de485f6 100644 --- a/src/components/organization/circle-card.vue +++ b/src/components/organization/circle-card.vue @@ -45,7 +45,7 @@ widget.bg-internal-bg.q-my-md.cursor-pointer .h-h4 {{ name }} .text-italic.q-ml-md(v-if="subcircles.length > 0") {{ $t('organization.circle-card.subCircles', { '1': subcircles.length }) }} q-btn.q-ml-md.text-primary.h-h7(:icon-right="expandIcon" @click="toggleExpanded" dense flat :label="$t('organization.circle-card.showSubcirclesDetails')" no-caps v-if="subcircles.length > 0") - q-btn.q-ml-md.text-primary.h-h7(@click="$router.replace($route.path.includes('circles') ? id : 'circles/' + id)" dense flat icon-right="fas fa-chevron-right" :label="$t('organization.circle-card.goToCircle')" no-caps) + q-btn.q-ml-md.text-primary.h-h7(@click="$router.push(`/${$route.params.dhoname}/circles/` + id)" dense flat icon-right="fas fa-chevron-right" :label="$t('organization.circle-card.goToCircle')" no-caps) template(v-if="isExpanded && subcircles") widget.q-pa-md.q-my-xs(v-if="subcircles" v-for="circle, index in subcircles" v-bind:key="index" noPadding) .row.items-center From dc87083fdaa48b15cbda0bc4273dc355181a842a Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Thu, 20 Jun 2024 09:44:38 +0300 Subject: [PATCH 52/65] fix(proposal-view): see profile link (#1313) --- src/components/proposals/proposal-view.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/proposals/proposal-view.vue b/src/components/proposals/proposal-view.vue index 52fb60eca..414f361e4 100644 --- a/src/components/proposals/proposal-view.vue +++ b/src/components/proposals/proposal-view.vue @@ -114,7 +114,7 @@ export default { return this.getSalaryBucket(this.salary) }, profile () { - return `/${this.$store.getters['dao/selectedDao'].name}/@${this.creator}` + return `/${this.daoSettings.settings_daoUrl_s}/@${this.creator}` }, descriptionWithoutSpecialCharacters () { const regex = / /gi From ade652b1d457ad4e5b67ec38701f860ac74f206a Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Thu, 20 Jun 2024 10:39:11 +0300 Subject: [PATCH 53/65] fix(wallet-base): hit texts (#1312) --- src/components/profiles/wallet-base.vue | 4 ++-- src/locales/en.json | 2 ++ src/locales/es.json | 4 +++- src/locales/fr.json | 4 +++- src/locales/ko.json | 4 +++- src/locales/mk.json | 4 +++- src/locales/pt.json | 4 +++- src/locales/sr.json | 4 +++- src/locales/zh.json | 4 +++- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/components/profiles/wallet-base.vue b/src/components/profiles/wallet-base.vue index 41d16202d..a4a8b5ac7 100644 --- a/src/components/profiles/wallet-base.vue +++ b/src/components/profiles/wallet-base.vue @@ -487,10 +487,10 @@ widget.wallet-base(:more="more" :no-title="noTitle" morePosition="top" :title="$ :label="$t('profiles.wallet-base.send')" @click="state = STATE.SENDING" ) - q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") {{ $t('profiles.wallet-base.queueHusdRedemption', { tokenName: tokenName }) }} + q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") {{ $t('profiles.wallet-base.sendUtilityTokens') }} q-btn.h-btn1.full-width.q-mt-sm(v-if="canRedeem" color="primary" no-caps unelevated rounded :label="$t('profiles.wallet-base.redeem')" @click="showPayoutModal = true") - q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") {{ $t('profiles.wallet-base.queueHusdRedemption', { tokenName: tokenName }) }} + q-tooltip(:content-style="{ 'font-size': '1em' }" anchor="top middle" self="bottom middle") {{ $t('profiles.wallet-base.addPayoutTokens') }} diff --git a/src/components/navigation/left-navigation.vue b/src/components/navigation/left-navigation.vue index 0c96a90cf..0797854b1 100644 --- a/src/components/navigation/left-navigation.vue +++ b/src/components/navigation/left-navigation.vue @@ -71,7 +71,7 @@ export default { }, computed: { - ...mapGetters('dao', ['selectedDao']), + ...mapGetters('dao', ['selectedDao', 'daoSettings']), ...mapGetters('accounts', ['account', 'isAdmin']), activeTab() { if (this.$route.name === NAVIGATION.DASHBOARD) return NAVIGATION.DASHBOARD @@ -132,7 +132,7 @@ export default { q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.agreements') }} q-btn.q-ma-md(:class="{'active': activeTab=== NAVIGATION.PEOPLE}" :flat="activeTab !== NAVIGATION.PEOPLE" unelevated rounded padding="12px" icon="fas fa-users" size="sm" :color="activeTab === NAVIGATION.PEOPLE ? 'primary' : 'disabled'" :to="{ name: NAVIGATION.PEOPLE }") q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.people') }} - q-btn.q-ma-md(v-if="hasElections || isAdmin" :class="{'active': activeTab=== NAVIGATION.ELECTION}" :flat="activeTab !== NAVIGATION.ELECTION" unelevated rounded padding="12px" size="sm" :color="activeTab === NAVIGATION.ELECTION ? 'primary' : 'disabled'" :to="{ name: NAVIGATION.ELECTION }") + q-btn.q-ma-md(v-if="(hasElections || isAdmin) && daoSettings.showUpvoteElection" :class="{'active': activeTab=== NAVIGATION.ELECTION}" :flat="activeTab !== NAVIGATION.ELECTION" unelevated rounded padding="12px" size="sm" :color="activeTab === NAVIGATION.ELECTION ? 'primary' : 'disabled'" :to="{ name: NAVIGATION.ELECTION }") img.no-active(:class="{ 'active-btn': activeTab=== NAVIGATION.ELECTION }" :src="activeTab=== NAVIGATION.ELECTION ? IconVotingWhite : IconVoting") q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.election') }} q-btn.q-ma-md(:class="{'active': activeTab=== NAVIGATION.TREASURY}" :flat="activeTab !== NAVIGATION.TREASURY" unelevated rounded padding="12px" icon="fas fa-building" size="sm" :color="activeTab === NAVIGATION.TREASURY ? 'primary' : 'disabled'" :to="{ name: NAVIGATION.TREASURY }") diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index a2b38b6a8..53fc8b5bd 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -78,6 +78,7 @@ const ACTIVE_DAO_QUERY = ` settings_communityVotingDurationSec_i settings_communityVotingAlignmentPercent_i settings_communityVotingQuorumPercent_i + settings_showUpvoteElection_i settings_usesSeeds_i settings_isHypha_i diff --git a/src/locales/en.json b/src/locales/en.json index e94cb350b..182a5a1a5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "Documentation URL" }, - "sample-text":"This text must be visible in both colors" + "sample-text":"This text must be visible in both colors", + "showUpvoteElection": { + "label": "Show Upvote Election" + } }, "nav":{ "show-more":"Show more options", diff --git a/src/locales/es.json b/src/locales/es.json index 398c8f0fb..fcf0e9910 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "URL de documentación" }, - "sample-text": "Este texto debe ser visible en ambos colores." + "sample-text": "Este texto debe ser visible en ambos colores.", + "showUpvoteElection": { + "label": "Mostrar elección de voto a favor" + } }, "nav": { "show-more": "Mostrar más opciones", diff --git a/src/locales/fr.json b/src/locales/fr.json index 52132377c..270671e7f 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "URL de la documentation" }, - "sample-text": "Ce texte doit être visible dans les deux couleurs" + "sample-text": "Ce texte doit être visible dans les deux couleurs", + "showUpvoteElection": { + "label": "Afficher l'élection de vote positif" + } }, "nav": { "show-more": "Afficher plus d'options", diff --git a/src/locales/ko.json b/src/locales/ko.json index 7c7c04e4c..7e80c4829 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "문서 URL" }, - "sample-text": "이 텍스트는 두 가지 색상으로 모두 표시되어야 합니다." + "sample-text": "이 텍스트는 두 가지 색상으로 모두 표시되어야 합니다.", + "showUpvoteElection": { + "label": "찬성 투표 표시" + } }, "nav": { "show-more": "더 많은 옵션 보기", diff --git a/src/locales/mk.json b/src/locales/mk.json index 23a1eb8ea..99879e8ce 100644 --- a/src/locales/mk.json +++ b/src/locales/mk.json @@ -135,7 +135,10 @@ "text-color": { "label": "Боја на текстот" }, - "sample-text": "Овој текст мора да биде видлив во двете бои" + "sample-text": "Овој текст мора да биде видлив во двете бои", + "showUpvoteElection": { + "label": "Прикажи гласање позитивно" + } }, "nav": { "show-more": "Прикажи повеќе опции", diff --git a/src/locales/pt.json b/src/locales/pt.json index 77b2351b3..44158d757 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "URL da documentação" }, - "sample-text": "Este texto deve estar visível em ambas as cores" + "sample-text": "Este texto deve estar visível em ambas as cores", + "showUpvoteElection": { + "label": "Mostrar eleição positiva" + } }, "nav": { "show-more": "Mostrar mais opções", diff --git a/src/locales/sr.json b/src/locales/sr.json index 13a178e7d..2df9cb2b4 100644 --- a/src/locales/sr.json +++ b/src/locales/sr.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "УРЛ документације" }, - "sample-text": "Овај текст мора бити видљив у обе боје" + "sample-text": "Овај текст мора бити видљив у обе боје", + "showUpvoteElection": { + "label": "Прикажи изборе за гласање" + } }, "nav": { "show-more": "Прикажи више опција", diff --git a/src/locales/zh.json b/src/locales/zh.json index 5154321b3..cc06e3484 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -138,7 +138,10 @@ "documentation-url":{ "label": "文档 URL" }, - "sample-text": "此文本必须以两种颜色显示" + "sample-text": "此文本必须以两种颜色显示", + "showUpvoteElection": { + "label": "显示支持选举" + } }, "nav": { "show-more": "显示更多选项", diff --git a/src/pages/dho/Configuration.vue b/src/pages/dho/Configuration.vue index 6951c2447..0d6f381d0 100644 --- a/src/pages/dho/Configuration.vue +++ b/src/pages/dho/Configuration.vue @@ -18,8 +18,8 @@ const settingsMapper = (data) => { ...(exist(form.votingAlignmentPercent) ? { votingAlignmentX100: form.votingAlignmentPercent } : {}), ...(exist(form.votingQuorumPercent) ? { votingQuorumX100: form.votingQuorumPercent } : {}), - ...(exist(form.communityVotingEnabled) ? { communityVotingEnabled: form.communityVotingEnabled ? 1 : 0 } : {}) - + ...(exist(form.communityVotingEnabled) ? { communityVotingEnabled: form.communityVotingEnabled ? 1 : 0 } : {}), + ...(exist(form.showUpvoteElection) ? { showUpvoteElection: form.showUpvoteElection ? 1 : 0 } : {}) } } @@ -62,7 +62,7 @@ const defaultSettings = { communityVotingEnabled: false, communityVotingDurationSec: 604800, communityVotingAlignmentPercent: 20, - communityVotingQuorumPercent: 50 + communityVotingQuorumPercent: 50, // TODO: // communityVotingMethod: 'CLASSIC', @@ -76,6 +76,7 @@ const defaultSettings = { // upvoteHeadDelegateRound: false, // upvoteHeadDelegateDuration: 10800, + showUpvoteElection: false } const TABS = Object.freeze({ @@ -150,7 +151,7 @@ export default { communityVotingEnabled: this.daoSettings?.communityVotingEnabled ? this.daoSettings?.communityVotingEnabled : defaultSettings.communityVotingEnabled, communityVotingDurationSec: this.daoSettings?.communityVotingDurationSec ? this.daoSettings?.communityVotingDurationSec : defaultSettings.communityVotingDurationSec, communityVotingAlignmentPercent: this.daoSettings?.communityVotingAlignmentPercent ? this.daoSettings?.communityVotingAlignmentPercent : defaultSettings.communityVotingAlignmentPercent, - communityVotingQuorumPercent: this.daoSettings?.communityVotingQuorumPercent ? this.daoSettings?.communityVotingQuorumPercent : defaultSettings.communityVotingQuorumPercent + communityVotingQuorumPercent: this.daoSettings?.communityVotingQuorumPercent ? this.daoSettings?.communityVotingQuorumPercent : defaultSettings.communityVotingQuorumPercent, // TODO // communityVotingMethod: this.daoSettings?.communityVotingMethod ? this.daoSettings?.communityVotingMethod : defaultSettings.communityVotingMethod, @@ -163,7 +164,7 @@ export default { // upvoteCheifDelegateDuration: this.daoSettings?.upvoteCheifDelegateDuration ? this.daoSettings?.upvoteCheifDelegateDuration : defaultSettings.upvoteCheifDelegateDuration, // upvoteHeadDelegateRound: this.daoSettings?.upvoteHeadDelegateRound ? this.daoSettings?.upvoteHeadDelegateRound : defaultSettings.upvoteHeadDelegateRound, // upvoteHeadDelegateDuration: this.daoSettings?.upvoteHeadDelegateDuration ? this.daoSettings?.upvoteHeadDelegateDuration : defaultSettings.upvoteHeadDelegateDuration, - + showUpvoteElection: this?.daoSettings?.showUpvoteElection != null ? this?.daoSettings?.showUpvoteElection : defaultSettings.showUpvoteElection } this.resetForm() @@ -239,7 +240,6 @@ export default { async updateSettings () { try { this.state = CONFIGURATION_STATE.SAVING - await this.updateDAOSettings({ data: { ...this.dataForSave } }) const url = this.dataForSave.daoUrl diff --git a/src/query/dao-created.gql b/src/query/dao-created.gql index 81b6cb1b9..07bb9c1da 100644 --- a/src/query/dao-created.gql +++ b/src/query/dao-created.gql @@ -71,6 +71,7 @@ query activeDaoCreated($regexp: String!, $username: String!) { settings_exploreParagraph_s settings_documentationURL_s + settings_showUpvoteElection_i } memberAggregate { diff --git a/src/query/dao-draft-created.gql b/src/query/dao-draft-created.gql index de068365b..8c72873c2 100644 --- a/src/query/dao-draft-created.gql +++ b/src/query/dao-draft-created.gql @@ -66,6 +66,7 @@ query daoDraft($daoName: String!) { settings_exploreParagraph_s settings_documentationURL_s + settings_showUpvoteElection_i } } } diff --git a/src/store/dao/mutations.js b/src/store/dao/mutations.js index 0be9bcdeb..ba20d287b 100644 --- a/src/store/dao/mutations.js +++ b/src/store/dao/mutations.js @@ -61,6 +61,8 @@ const settingsMapper = (settings) => { upvoteHeadDelegateRound: settings?.settings_upvoteHeadDelegateRound_i, upvoteHeadDelegateDuration: settings?.settings_upvoteHeadDelegateDuration_i, + showUpvoteElection: Boolean(settings?.settings_showUpvoteElection_i), + usesSeeds: Boolean(settings?.settings_usesSeeds_i), isHypha: Boolean(settings?.settings_isHypha_i), From f57a3a58495c36986b4afaa3d66dee651dbf85b3 Mon Sep 17 00:00:00 2001 From: Evgeni B Date: Mon, 15 Jul 2024 10:28:31 +0300 Subject: [PATCH 59/65] fix(chips): salary proposal labels (#DEV-1333) (#2651) --- .../proposals/proposal-card-chips.vue | 68 +++++++++++++++++-- src/pages/proposals/ProposalHistory.vue | 1 + src/pages/proposals/ProposalList.vue | 2 +- .../proposals/create/OptionsArchetypes.vue | 1 + src/query/archetypes/dao-archetypes.gql | 2 +- .../proposals/dao-proposal-detail-subs.gql | 4 ++ src/query/proposals/dao-proposal-detail.gql | 1 + .../dao-proposals-active-vote-subs.gql | 4 ++ .../proposals/dao-proposals-active-vote.gql | 1 + src/query/proposals/dao-proposals-active.gql | 11 ++- src/query/proposals/dao-proposals-history.gql | 1 + .../proposals/dao-proposals-stage-subs.gql | 5 ++ src/query/proposals/dao-proposals-stage.gql | 5 ++ src/utils/proposal-parsing.js | 5 +- 14 files changed, 96 insertions(+), 15 deletions(-) diff --git a/src/components/proposals/proposal-card-chips.vue b/src/components/proposals/proposal-card-chips.vue index 79de6b4ca..9dd4424ae 100644 --- a/src/components/proposals/proposal-card-chips.vue +++ b/src/components/proposals/proposal-card-chips.vue @@ -1,6 +1,25 @@ @@ -52,7 +69,7 @@ export default defineComponent({ ipfs-image-viewer(:color="daoLogo ? 'white' : 'secondary'" :ipfsCid="daoLogo" :size="size" showDefault) .div.absolute.text-white.token-overlay(v-if="type === 'voice' || type === 'cash'") .div.absolute.text-white.token-text(v-if="type === 'voice'") V - .div.absolute.text-white.token-text(v-if="type === 'cash'") $ + .div.absolute.text-white.token-text(v-if="type === 'cash'") {{ daoSettings.treasuryCurrency ? getCurrencySymbol(daoSettings.treasuryCurrency): '$' }}