From 63f16aaced1a8be2cabcd1abc9d28ca2068788f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:34:29 +0530 Subject: [PATCH 1/4] Update Snapshot packages (#4672) Co-authored-by: ChaituVR --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6ba6f3e8..898298bc 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@sentry/vite-plugin": "^2.10.1", "@sentry/vue": "^7.80.1", "@shutter-network/shutter-crypto": "1.0.1", - "@snapshot-labs/lock": "^0.2.3", + "@snapshot-labs/lock": "^0.2.4", "@snapshot-labs/pineapple": "^1.1.0", "@snapshot-labs/snapshot.js": "^0.11.16", "@vue/apollo-composable": "4.0.0-beta.11", diff --git a/yarn.lock b/yarn.lock index 62b0c567..9423bb87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1640,10 +1640,10 @@ "@snapshot-labs/eslint-config-base" "^0.1.0-beta.15" eslint-plugin-vue "^9.18.1" -"@snapshot-labs/lock@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@snapshot-labs/lock/-/lock-0.2.3.tgz#6023433ac2c5ad9edb388e6913d8ccb4fedf5c38" - integrity sha512-D1yCbwukV0DHBWO5/yBGRO+0rkpngG52p52RRqsBg4gytyum9FW+GCULix+mq4VKmhN9V1xhH7Oc7BpBWIAJCg== +"@snapshot-labs/lock@^0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@snapshot-labs/lock/-/lock-0.2.4.tgz#aa90ac4f618e7e3a323a911aef28fe7e67d62cc8" + integrity sha512-6bhFOVPIMC8R3K0qGGNth2fHYUcw8pg2/g3rvVl9GLYqKYqAEI0DWqM4+t1R/Z8zLFyfMk7iVsVfK5Ivg1r7ig== dependencies: "@coinbase/wallet-sdk" "^3.4.0" "@portis/web3" "^4.0.6" From c3baef62249ec1364223358d9e588eee9bac9621 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 14 Apr 2024 19:02:24 +0530 Subject: [PATCH 2/4] Update Snapshot packages (#4676) Co-authored-by: ChaituVR --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 898298bc..97984ccf 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@shutter-network/shutter-crypto": "1.0.1", "@snapshot-labs/lock": "^0.2.4", "@snapshot-labs/pineapple": "^1.1.0", - "@snapshot-labs/snapshot.js": "^0.11.16", + "@snapshot-labs/snapshot.js": "^0.11.17", "@vue/apollo-composable": "4.0.0-beta.11", "@vueuse/core": "^10.6.1", "@vueuse/head": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 9423bb87..e3f6b025 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1666,10 +1666,10 @@ resolved "https://registry.yarnpkg.com/@snapshot-labs/prettier-config/-/prettier-config-0.1.0-beta.15.tgz#07e5ae35ed36304250462218e115bab1c1609812" integrity sha512-va6zYSl8oIraBJeIZWEatOI292rfJQouyyvEeHv8qi9ns+LgxMsKayQtXSqn9GcmAfdWQVs/P9bDaCQ77FyJYw== -"@snapshot-labs/snapshot.js@^0.11.16": - version "0.11.16" - resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.16.tgz#36d88a75adeb4b418ba163fb426aa8bfbb0952bb" - integrity sha512-jE3ZUpsQTZT3t3h+2NTu7ZhrUuvSIUixBZ3ziG54GNo/z2j24d5JrwagbJHFlNsqJQ1b84lA3cwO6UexJMGdOQ== +"@snapshot-labs/snapshot.js@^0.11.17": + version "0.11.17" + resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.17.tgz#e54a14622956515aba8b6333cbe423e6af3f2250" + integrity sha512-+zM274cRplyN17PQQpP391XhZOV+1ET/bppIY7YfvAIid+q+7TwaTK3VD2kq00ZA2AdasR/f0dwvieKUnTyTUg== dependencies: "@ensdomains/eth-ens-namehash" "^2.0.15" "@ethersproject/abi" "^5.6.4" From f8e851316f99ab46919d0dfd0c462d7b9e6061f1 Mon Sep 17 00:00:00 2001 From: Chaitanya Date: Sun, 14 Apr 2024 22:52:08 +0530 Subject: [PATCH 3/4] fix: Remove color change on hover for domino plugin (#4678) --- src/plugins/domino/components/CustomBlock.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/domino/components/CustomBlock.vue b/src/plugins/domino/components/CustomBlock.vue index 9509c1a4..3741ed38 100644 --- a/src/plugins/domino/components/CustomBlock.vue +++ b/src/plugins/domino/components/CustomBlock.vue @@ -66,7 +66,7 @@ const customWorkflowUrl = computed(() => {
  • - + { height="36" /> -
    {{ item.name }}
    +
    {{ item.name }}
  • -
    +
    {{ $t('domino.viewMore') }}
    From cb5ca02e0ac8f66b6879190237845aae284ae3ce Mon Sep 17 00:00:00 2001 From: Chaitanya Date: Tue, 16 Apr 2024 01:29:31 +0530 Subject: [PATCH 4/4] Rename to 'Quorum of rejection' (#4677) --- src/components/ProposalsItemFooter.vue | 6 +++--- src/components/SettingsVotingBlock.vue | 4 ++-- src/components/SpaceProposalResultsQuorum.vue | 4 ++-- src/composables/useQuorum.ts | 2 +- src/helpers/interfaces.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/ProposalsItemFooter.vue b/src/components/ProposalsItemFooter.vue index 414cb05f..2d208a48 100644 --- a/src/components/ProposalsItemFooter.vue +++ b/src/components/ProposalsItemFooter.vue @@ -12,9 +12,9 @@ const quorumText = computed(() => { return ''; } - const optimisticQuorum = props.proposal.quorumType === 'optimistic'; + const quorumOfRejection = props.proposal.quorumType === 'rejection'; const percentage = formatPercentNumber( - optimisticQuorum + quorumOfRejection ? Number( props.proposal.scores .filter((c, i) => i === 1) @@ -22,7 +22,7 @@ const quorumText = computed(() => { ) : Number(props.proposal.scores_total / props.proposal.quorum) ); - return optimisticQuorum + return quorumOfRejection ? `${percentage} quorum rejection` : `${percentage} quorum reached`; }); diff --git a/src/components/SettingsVotingBlock.vue b/src/components/SettingsVotingBlock.vue index 48f4aaa1..2557b4a8 100644 --- a/src/components/SettingsVotingBlock.vue +++ b/src/components/SettingsVotingBlock.vue @@ -40,8 +40,8 @@ const { form, validationErrors } = useFormSpaceSettings(props.context); name: 'Default' }, { - value: 'optimistic', - name: 'Optimistic' + value: 'rejection', + name: 'Quorum of rejection' } ]" :disabled="isViewOnly" diff --git a/src/components/SpaceProposalResultsQuorum.vue b/src/components/SpaceProposalResultsQuorum.vue index fed97d74..a72e7fd2 100644 --- a/src/components/SpaceProposalResultsQuorum.vue +++ b/src/components/SpaceProposalResultsQuorum.vue @@ -17,7 +17,7 @@ const { formatCompactNumber, formatPercentNumber } = useIntl();
    - {{ quorumType === 'optimistic' ? 'Optimistic Quorum' : 'Quorum' }} + {{ quorumType === 'rejection' ? 'Quorum of rejection' : 'Quorum' }}
    @@ -29,7 +29,7 @@ const { formatCompactNumber, formatPercentNumber } = useIntl(); /> diff --git a/src/composables/useQuorum.ts b/src/composables/useQuorum.ts index 73ce8add..e4cd84f7 100644 --- a/src/composables/useQuorum.ts +++ b/src/composables/useQuorum.ts @@ -18,7 +18,7 @@ export function useQuorum(props: QuorumProps) { const quorumType = ref('default'); const totalQuorumScore = computed(() => { - if (props.proposal.quorumType === 'optimistic') { + if (props.proposal.quorumType === 'rejection') { return props.results.scores .filter((c, i) => i === 1) .reduce((a, b) => a + b, 0); diff --git a/src/helpers/interfaces.ts b/src/helpers/interfaces.ts index 972e36f3..20980e94 100644 --- a/src/helpers/interfaces.ts +++ b/src/helpers/interfaces.ts @@ -179,7 +179,7 @@ export interface ExtendedSpace { hideAbstain: boolean; period: number | null; quorum: number | null; - quorumType: 'default' | 'optimistic'; + quorumType: 'default' | 'rejection'; type: string | null; privacy: string | null; }; @@ -230,7 +230,7 @@ export interface Proposal { validation: VoteValidation; discussion: string; quorum: number; - quorumType: 'default' | 'optimistic'; + quorumType: 'default' | 'rejection'; scores: number[]; scores_state: string; scores_total: number;