Merge branch 'fix-voting-power-check' of https://github.com/snapshot-…

…labs/sx-monorepo into fix-voting-power-check
snapshot-labs · Jan 8, 2025 · c808a9d · c808a9d
2 parents fe90b0a + 22488df
commit c808a9d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/apps/ui/package.json b/apps/ui/package.json
@@ -50,7 +50,7 @@
     "@snapshot-labs/lock": "^0.2.10",
     "@snapshot-labs/pineapple": "^1.1.0",
     "@snapshot-labs/prettier-config": "^0.1.0-beta.18",
-    "@snapshot-labs/snapshot.js": "^0.12.40",
+    "@snapshot-labs/snapshot.js": "^0.12.41",
     "@snapshot-labs/sx": "^0.1.0",
     "@vueuse/core": "^10.4.1",
     "@walletconnect/core": "^2.11.0",

diff --git a/apps/ui/src/components/FormSpaceAdvanced.vue b/apps/ui/src/components/FormSpaceAdvanced.vue
@@ -201,8 +201,9 @@ watchEffect(() => {
     type="info"
     :learn-more-link="'https://docs.snapshot.box/spaces/add-custom-domain'"
   >
-    To setup a custom domain you additionally need to open a pull request on
-    GitHub after you have created the space.
+    To set up a custom domain, you must subscribe to the Turbo plan and create a
+    CNAME record pointing to "cname.snapshot.box" with your DNS provider or
+    registrar.
   </UiMessage>
   <div class="s-box mt-3">
     <UiInputString

diff --git a/apps/ui/src/components/Layout/App.vue b/apps/ui/src/components/Layout/App.vue
@@ -222,7 +222,7 @@ router.afterEach(() => {
       @add="handleTransactionAccept"
       @close="handleTransactionReject"
     />
-    <FlashMessageWelcome />
+    <FlashMessageWelcome v-if="!whiteLabelSpace" />
   </div>
 </template>
 

diff --git a/apps/ui/src/components/ProposalExecutionsList.vue b/apps/ui/src/components/ProposalExecutionsList.vue
@@ -102,7 +102,7 @@ function downloadExecution(execution: ProposalExecution) {
         proposal.executions &&
         proposal.executions.length > 0 &&
         proposal.scores.length > 0 &&
-        getProposalCurrentQuorum(proposal.network, proposal) >
+        getProposalCurrentQuorum(proposal.network, proposal) >=
           proposal.quorum &&
         toBigIntOrNumber(proposal.scores[0]) >
           toBigIntOrNumber(proposal.scores[1]) &&

diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -266,7 +266,7 @@ function formatProposal(
     proposal.execution_strategy_type === 'EthRelayer' && baseNetworkId
       ? baseNetworkId
       : networkId;
-
+  const state = getProposalState(networkId, proposal, current);
   return {
     ...proposal,
     space: {
@@ -299,11 +299,12 @@ function formatProposal(
     )
       ? proposal.max_end <= current
       : proposal.min_end <= current,
-    state: getProposalState(networkId, proposal, current),
+    state,
     network: networkId,
     privacy: null,
     quorum: +proposal.quorum,
-    flagged: false
+    flagged: false,
+    completed: ['passed', 'executed', 'rejected'].includes(state)
   };
 }
 

diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
@@ -392,6 +392,7 @@ watchEffect(() => {
             <button
               v-if="
                 proposal.network === 's' &&
+                proposal.completed &&
                 ['passed', 'rejected', 'executed'].includes(proposal.state)
               "
               class="mt-2.5 inline-flex items-center gap-2 hover:text-skin-link"

diff --git a/apps/ui/src/views/Space.vue b/apps/ui/src/views/Space.vue
@@ -36,7 +36,7 @@ watch(
 );
 
 watchEffect(() => {
-  if (!space.value || isWhiteLabel.value) {
+  if (!space.value) {
     setFavicon(null);
     return;
   }

diff --git a/yarn.lock b/yarn.lock
@@ -2543,10 +2543,10 @@
   resolved "https://registry.yarnpkg.com/@snapshot-labs/prettier-config/-/prettier-config-0.1.0-beta.18.tgz#fcbd86d4557821bff774d60e5c636ad47ed85d77"
   integrity sha512-v6tj7l19KJUWjBbsWpwxaYO2mlIDBFyAG0OMSPhUgrhltO7b6R4Ejxn2k4Qgi/NtlnOrj+3Gt3eQRry8Jfgjrg==
 
-"@snapshot-labs/snapshot.js@^0.12.40":
-  version "0.12.40"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.40.tgz#ab07a35f057de380cf0c5f6f661370001dce2a50"
-  integrity sha512-pZb3xERF6w8n6p8tm9pD5OIwJMPklrFA8UzOKZQvJFH+nn3CMJdlbp1rp496oVzd6tArrHrQ6sLI0Nbo59nBCw==
+"@snapshot-labs/snapshot.js@^0.12.41":
+  version "0.12.41"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.41.tgz#3a0a2866a78f14368eb0648ef2e22a8e66422b26"
+  integrity sha512-Deikl21gUzeY/2TE8xTNsHbwTNcSqvxDnrzA1LcLwyqAzA6tigwNBlqaS5E35v7t5z7Iz62j+CPEFzxv1ta6cA==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"