From b6d08869598ebcb0bdb9821ef8d7fff94501eb45 Mon Sep 17 00:00:00 2001
From: Gerhard Steenkamp <51655063+gsteenkamp89@users.noreply.github.com>
Date: Sat, 20 Apr 2024 04:06:47 +0200
Subject: [PATCH 01/27] fix: prevent unsupported treasuries from crashing
 proposal page (#4683)

* if safes not supported, fail silently but show error in console

* fix interface

* hide activate button if no config set up for chain

* edit copy
---
 .../SettingsTreasuriesBlockItemButton.vue     |  17 ++-
 src/plugins/oSnap/Create.vue                  |  51 +++++---
 src/plugins/oSnap/types.ts                    |   4 +
 src/plugins/oSnap/utils/getters.ts            | 120 ++++++++++++------
 src/plugins/safeSnap/constants.ts             |   6 +-
 5 files changed, 129 insertions(+), 69 deletions(-)

diff --git a/src/components/SettingsTreasuriesBlockItemButton.vue b/src/components/SettingsTreasuriesBlockItemButton.vue
index 3feb8f35d..0f40cc100 100644
--- a/src/components/SettingsTreasuriesBlockItemButton.vue
+++ b/src/components/SettingsTreasuriesBlockItemButton.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { TreasuryWallet } from '@/helpers/interfaces';
 import { Network } from '@/plugins/oSnap/types';
-import { getIsOsnapEnabled } from '@/plugins/oSnap/utils/getters';
+import { ConfigError, getIsOsnapEnabled } from '@/plugins/oSnap/utils/getters';
 
 const props = defineProps<{
   treasury: TreasuryWallet;
@@ -17,13 +17,21 @@ const emit = defineEmits<{
 }>();
 
 const isOsnapEnabled = ref(false);
+const isChainSupported = ref(true);
 
 async function updateIsOsnapEnabled() {
   if (!props.hasOsnapPlugin) return;
-  isOsnapEnabled.value = await getIsOsnapEnabled(
+  const isEnabled = await getIsOsnapEnabled(
     props.treasury.network as Network,
     props.treasury.address
-  );
+  ).catch(e => {
+    if (e instanceof ConfigError) {
+      isChainSupported.value = false;
+      return false;
+    }
+    return false;
+  });
+  isOsnapEnabled.value = isEnabled;
 }
 
 onMounted(async () => {
@@ -47,12 +55,13 @@ onUnmounted(() => {
     </div>
     <div class="ml-auto mr-3">
       <SettingsTreasuryActivateOsnapButton
-        v-show="hasOsnapPlugin"
+        v-if="hasOsnapPlugin && isChainSupported"
         :is-osnap-enabled="isOsnapEnabled"
         @click.stop="
           !isViewOnly && emit('configureOsnap', treasuryIndex, isOsnapEnabled)
         "
       />
+      <div v-else>oSnap unavailable</div>
     </div>
     <BaseButtonIcon
       v-show="!isViewOnly"
diff --git a/src/plugins/oSnap/Create.vue b/src/plugins/oSnap/Create.vue
index d4942df81..d9f8b4434 100644
--- a/src/plugins/oSnap/Create.vue
+++ b/src/plugins/oSnap/Create.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ExtendedSpace, TreasuryWallet } from '@/helpers/interfaces';
+import { ExtendedSpace } from '@/helpers/interfaces';
 import { formatUnits } from '@ethersproject/units';
 import { cloneDeep } from 'lodash';
 import SelectSafe from './components/Input/SelectSafe.vue';
@@ -11,7 +11,8 @@ import {
   Network,
   OsnapPluginData,
   Token,
-  Transaction
+  Transaction,
+  nonNullable
 } from './types';
 import {
   getGnosisSafeBalances,
@@ -159,34 +160,42 @@ async function fetchCollectibles(network: Network, gnosisSafeAddress: string) {
 // maps over the treasuries and creates a safe for each one
 // only returns safes that have oSnap enabled
 async function createOsnapEnabledSafes() {
-  const treasuriesWithOsnapEnabled = (
-    await Promise.all(
-      props.space.treasuries.map(async treasury => {
-        const isOsnapEnabled = await getIsOsnapEnabled(
-          treasury.network as Network,
-          treasury.address
-        );
-        return isOsnapEnabled ? treasury : null;
-      })
-    )
-  ).filter(treasury => treasury !== null) as TreasuryWallet[];
+  const treasuryPromises = await Promise.allSettled(
+    props.space.treasuries.map(async treasury => {
+      const isOsnapEnabled = await getIsOsnapEnabled(
+        treasury.network as Network,
+        treasury.address
+      );
+      return isOsnapEnabled ? treasury : null;
+    })
+  );
 
-  const safes: GnosisSafe[] = await Promise.all(
+  const treasuriesWithOsnapEnabled = treasuryPromises
+    .map(res => (res.status === 'fulfilled' ? res.value : null))
+    .filter(nonNullable);
+
+  const safePromises = await Promise.allSettled(
     treasuriesWithOsnapEnabled.map(async treasury => {
       const moduleAddress = await getModuleAddressForTreasury(
         treasury.network as Network,
         treasury.address
       );
-      return {
-        safeName: treasury.name,
-        safeAddress: toChecksumAddress(treasury.address),
-        network: treasury.network as Network,
-        transactions: [] as Transaction[],
-        moduleAddress
-      };
+      return moduleAddress
+        ? {
+            safeName: treasury.name,
+            safeAddress: toChecksumAddress(treasury.address),
+            network: treasury.network as Network,
+            transactions: [] as Transaction[],
+            moduleAddress
+          }
+        : null;
     })
   );
 
+  const safes = safePromises
+    .map(res => (res.status === 'fulfilled' ? res.value : null))
+    .filter(nonNullable);
+
   return safes;
 }
 
diff --git a/src/plugins/oSnap/types.ts b/src/plugins/oSnap/types.ts
index cf2533591..cd3955086 100644
--- a/src/plugins/oSnap/types.ts
+++ b/src/plugins/oSnap/types.ts
@@ -533,3 +533,7 @@ export namespace GnosisSafe {
     components?: ContractInput[];
   }
 }
+
+export function nonNullable<T>(value: T): value is NonNullable<T> {
+  return value !== null;
+}
diff --git a/src/plugins/oSnap/utils/getters.ts b/src/plugins/oSnap/utils/getters.ts
index 184658a77..e12569902 100644
--- a/src/plugins/oSnap/utils/getters.ts
+++ b/src/plugins/oSnap/utils/getters.ts
@@ -36,8 +36,7 @@ import {
   TransactionsProposedEvent
 } from '../types';
 import { getPagedEvents } from './events';
-import { toChecksumAddress } from '@/helpers/utils';
-import app from '../../../main';
+import { shortenAddress, toChecksumAddress } from '@/helpers/utils';
 
 /**
  * Calls the Gnosis Safe Transaction API
@@ -48,8 +47,8 @@ async function callGnosisSafeTransactionApi<TResult = any>(
   network: Network,
   url: string
 ) {
-  if(!GNOSIS_SAFE_TRANSACTION_API_URLS[network])
-    throw new Error(`No gnosis safe api defined for network ${network}`)
+  if (!GNOSIS_SAFE_TRANSACTION_API_URLS[network])
+    throw new Error(`No gnosis safe api defined for network ${network}`);
   const apiUrl = GNOSIS_SAFE_TRANSACTION_API_URLS[network];
   const response = await fetch(apiUrl + url);
   return response.json() as TResult;
@@ -100,6 +99,17 @@ function getDeployBlock(params: { network: Network; name: string }): number {
   return 0;
 }
 
+export class ConfigError extends Error {
+  constructor(message: string, responsibleVar: string) {
+    super(message);
+    this.name = 'CONFIG_ERROR';
+  }
+}
+
+export function logIfErrorMessage(e: unknown, overrideMessage: string) {
+  console.error(e instanceof Error ? e.message : overrideMessage);
+}
+
 /**
  * Fetches the subgraph url for a given contract on a given network.
  */
@@ -109,17 +119,17 @@ function getContractSubgraph(params: { network: Network; name: string }) {
       contract.network === params.network && contract.name === params.name
   );
   if (results.length > 1)
-    throw new Error(
-      `Too many results finding ${params.name} subgraph on network ${params.network}`
+    throw new ConfigError(
+      `Too many results finding ${params.name} subgraph on network ${params.network}`,
+      'subgraph'
     );
-  if (results.length < 1)
-    throw new Error(
-      `No results finding ${params.name} subgraph on network ${params.network}`
-    );
-  if (!results[0].subgraph)
-    throw new Error(
-      `No subgraph url defined for ${params.name} on network ${params.network}`
+
+  if (results.length < 1 || !results[0].subgraph)
+    throw new ConfigError(
+      `No subgraph url defined for ${params.name} on network ${params.network}`,
+      'subgraph'
     );
+
   return results[0].subgraph;
 }
 
@@ -180,23 +190,34 @@ export const getModuleAddressForTreasury = async (
   network: Network,
   treasuryAddress: string
 ) => {
-  const subgraph = getOptimisticGovernorSubgraph(network);
-  const query = `
-  query getModuleAddressForTreasury {
-      safe(id: "${treasuryAddress.toLowerCase()}") {
-        optimisticGovernor {
-          id
+  try {
+    const subgraph = getOptimisticGovernorSubgraph(network);
+    const query = `
+    query getModuleAddressForTreasury {
+        safe(id: "${treasuryAddress.toLowerCase()}") {
+          optimisticGovernor {
+            id
+          }
         }
-      }
-  }
-  `;
+    }
+    `;
 
-  type Result = {
-    safe: { optimisticGovernor: { id: string } };
-  };
+    type Result = {
+      safe: { optimisticGovernor: { id: string } };
+    };
 
-  const result = await queryGql<Result>(subgraph, query);
-  return result?.safe?.optimisticGovernor?.id ?? '';
+    const result = await queryGql<Result>(subgraph, query);
+    return result?.safe?.optimisticGovernor?.id ?? '';
+  } catch (error) {
+    logIfErrorMessage(
+      error,
+      `Unable to get module address for treasury ${shortenAddress(
+        treasuryAddress
+      )} on network ${network}`
+    );
+
+    throw error;
+  }
 };
 
 /**
@@ -206,19 +227,29 @@ export const getIsOsnapEnabled = async (
   network: Network,
   safeAddress: string
 ) => {
-  const subgraph = getOptimisticGovernorSubgraph(network);
-  const query = `
-      query isOSnapEnabled {
-        safe(id:"${safeAddress.toLowerCase()}"){
-          isOptimisticGovernorEnabled
+  try {
+    const subgraph = getOptimisticGovernorSubgraph(network);
+    const query = `
+        query isOSnapEnabled {
+          safe(id:"${safeAddress.toLowerCase()}"){
+            isOptimisticGovernorEnabled
+          }
         }
-      }
-    `;
-  type Result = {
-    safe: { isOptimisticGovernorEnabled: boolean };
-  };
-  const result = await queryGql<Result>(subgraph, query);
-  return result?.safe?.isOptimisticGovernorEnabled ?? false;
+      `;
+    type Result = {
+      safe: { isOptimisticGovernorEnabled: boolean };
+    };
+    const result = await queryGql<Result>(subgraph, query);
+    return result?.safe?.isOptimisticGovernorEnabled ?? false;
+  } catch (error) {
+    logIfErrorMessage(
+      error,
+      `Unable to check if oSnap is enable for address ${shortenAddress(
+        safeAddress
+      )} on network ${network}`
+    );
+    throw error;
+  }
 };
 
 /**
@@ -672,7 +703,11 @@ export async function getOGProposalStateGql(params: {
   }
 
   // request execution if there is no settlement yet and liveness has expired
-  return { status: 'can-request-tx-execution', assertionHash, assertionLogIndex };
+  return {
+    status: 'can-request-tx-execution',
+    assertionHash,
+    assertionLogIndex
+  };
 }
 
 /**
@@ -746,7 +781,10 @@ export function getSafeNetworkPrefix(network: Network): SafeNetworkPrefix {
 export function getSafeAppLink(
   network: Network,
   safeAddress: string,
-  {appUrl = 'https://app.safe.global', path = '/home' } = {appUrl: 'https://app.safe.global', path: '/home'}
+  { appUrl = 'https://app.safe.global', path = '/home' } = {
+    appUrl: 'https://app.safe.global',
+    path: '/home'
+  }
 ) {
   const prefix = getSafeNetworkPrefix(network);
   return new URL(`${path}?safe=${prefix}:${safeAddress}`, appUrl).toString();
diff --git a/src/plugins/safeSnap/constants.ts b/src/plugins/safeSnap/constants.ts
index 46bed48b4..066dc2a67 100644
--- a/src/plugins/safeSnap/constants.ts
+++ b/src/plugins/safeSnap/constants.ts
@@ -33,7 +33,7 @@ export const EXPLORER_API_URLS = {
   '56': 'https://api.bscscan.com/api',
   '42161': 'https://api.arbiscan.io/api',
   // '1116': Add 'https://openapi.coredao.org/api' if API key requirement is removed
-  '11155111': 'https://api-sepolia.etherscan.io/api',
+  '11155111': 'https://api-sepolia.etherscan.io/api'
 };
 
 export const GNOSIS_SAFE_TRANSACTION_API_URLS = {
@@ -46,7 +46,7 @@ export const GNOSIS_SAFE_TRANSACTION_API_URLS = {
   '56': 'https://safe-transaction-bsc.safe.global/api',
   '42161': 'https://safe-transaction-arbitrum.safe.global/api',
   '1116': 'https://safetx.coredao.org/api',
-  '11155111': 'https://safe-transaction-sepolia.safe.global/api',
+  '11155111': 'https://safe-transaction-sepolia.safe.global/api'
 };
 
 // ABIs
@@ -586,5 +586,5 @@ export const contractData: ContractData[] = [
     deployBlock: 5421242,
     subgraph:
       'https://api.thegraph.com/subgraphs/name/reinis-frp/sepolia-optimistic-governor'
-  },
+  }
 ];

From bcf4331b2496871eeb9ae4deca56562dba9287ad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2024 07:44:07 +0530
Subject: [PATCH 02/27] Update Snapshot packages (#4685)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 97984ccff..d90d840ef 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.17",
+    "@snapshot-labs/snapshot.js": "^0.11.18",
     "@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 e3f6b0257..c108df41e 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.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==
+"@snapshot-labs/snapshot.js@^0.11.18":
+  version "0.11.18"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.18.tgz#d8557f4204691245bdfd986e8a0cd352786954ae"
+  integrity sha512-cNCyCr007K1uMyQ/ju+VwFWlOkuEVPd+fRCWRJPpikGoLgNUuESFw+7GMPLFkGnDvVPTZ2X3vME23aAxme/h8A==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From ac12784fa505df046e4ce655a1e6b2e298ff9a6e Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Mon, 22 Apr 2024 20:27:08 +0530
Subject: [PATCH 03/27] fix: ChainId is wrong while switching the network
 (#4690)

---
 src/composables/useChangeNetwork.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/composables/useChangeNetwork.ts b/src/composables/useChangeNetwork.ts
index cdab7369b..c3f0dbe58 100644
--- a/src/composables/useChangeNetwork.ts
+++ b/src/composables/useChangeNetwork.ts
@@ -1,6 +1,5 @@
 import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { sleep } from '@snapshot-labs/snapshot.js/src/utils';
-import { hexlify } from '@ethersproject/bytes';
 
 export function useChangeNetwork() {
   const changingNetwork = ref(false);
@@ -11,7 +10,7 @@ export function useChangeNetwork() {
       method: 'wallet_switchEthereumChain',
       params: [
         {
-          chainId: hexlify(Number(networks[network].chainId))
+          chainId: `0x${Number(networks[network].chainId).toString(16)}`
         }
       ]
     });

From 48c42194f640e8ac58d7620e4f57a297f3cc0786 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 23 Apr 2024 17:40:11 +0400
Subject: [PATCH 04/27] fix: enable boost on shielded voting proposals (#4668)

* fix: enable boost on shielded voting proposals

* Add ranked choice to boost

* Show boost on ranked choice

* remove comment

* fix: disable bribing for shutter and unsupported voting type

* fix: improve message

* fix: fix wrong contract function name

---------

Co-authored-by: ChaituVR <yourchaitu@gmail.com>
---
 src/components/SpaceCreateVoting.vue  | 14 ++--------
 src/components/SpaceProposalBoost.vue |  2 +-
 src/components/SpaceProposalPage.vue  |  5 ++--
 src/helpers/boost/index.ts            |  2 +-
 src/helpers/constants.ts              |  6 ++++
 src/views/SpaceBoost.vue              | 40 +++++++++++++++++++++------
 6 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/components/SpaceCreateVoting.vue b/src/components/SpaceCreateVoting.vue
index b887575d9..ef55d157b 100644
--- a/src/components/SpaceCreateVoting.vue
+++ b/src/components/SpaceCreateVoting.vue
@@ -3,6 +3,7 @@ import { ExtendedSpace } from '@/helpers/interfaces';
 import draggable from 'vuedraggable';
 import SpaceCreateLegacyOsnap from './SpaceCreateLegacyOsnap.vue';
 import SpaceCreateOsnap from './SpaceCreateOsnap.vue';
+import { BOOST_ENABLED_VOTING_TYPES } from '@/helpers/constants';
 
 const props = defineProps<{
   space: ExtendedSpace;
@@ -122,20 +123,11 @@ defineEmits<{
       />
       <template v-if="isWhitelisted(space.id)">
         <BaseMessage
-          v-if="form.type !== 'single-choice' && form.type !== 'basic'"
+          v-if="!BOOST_ENABLED_VOTING_TYPES.includes(form.type)"
           level="info"
           class="mt-2 border bg-[--border-color-subtle] p-3 rounded-xl"
         >
-          Note that Boost is not available for this voting type. Please use
-          Basic or Single Choice if you want to use Boost.
-        </BaseMessage>
-        <BaseMessage
-          v-else-if="space.voting.privacy === 'shutter'"
-          level="info"
-          class="mt-2 border bg-[--border-color-subtle] p-3 rounded-xl"
-        >
-          Note that Boost is not available with Shutter encrypted voting. Please
-          disable it in the space settings if you want to use Boost.
+          Note that Boost is not available for this voting type.
         </BaseMessage>
       </template>
 
diff --git a/src/components/SpaceProposalBoost.vue b/src/components/SpaceProposalBoost.vue
index 799831feb..89163bd46 100644
--- a/src/components/SpaceProposalBoost.vue
+++ b/src/components/SpaceProposalBoost.vue
@@ -50,7 +50,7 @@ function isEligible(boost: BoostSubgraph) {
   const choice = boost.strategy.eligibility.choice;
 
   if (!web3Account.value) return false;
-  if (props.proposal.privacy === 'shutter' && !isFinal.value) return false;
+  if (!isFinal.value) return false;
   if (!userVote.value) return false;
   if (choice === null) return true;
 
diff --git a/src/components/SpaceProposalPage.vue b/src/components/SpaceProposalPage.vue
index 8fa929cd7..b69b6c50a 100644
--- a/src/components/SpaceProposalPage.vue
+++ b/src/components/SpaceProposalPage.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import voting from '@snapshot-labs/snapshot.js/src/voting';
 import { ExtendedSpace, Proposal, Results } from '@/helpers/interfaces';
+import { BOOST_ENABLED_VOTING_TYPES } from '@/helpers/constants';
 
 const props = defineProps<{ space: ExtendedSpace; proposal: Proposal }>();
 const emit = defineEmits(['reload-proposal']);
@@ -56,9 +57,7 @@ const strategies = computed(
 
 const boostEnabled = computed(() => {
   return (
-    (props.proposal.type === 'basic' ||
-      props.proposal.type === 'single-choice') &&
-    props.proposal.privacy !== 'shutter' &&
+    BOOST_ENABLED_VOTING_TYPES.includes(props.proposal.type) &&
     isWhitelisted(props.space.id) &&
     props.space.boost.enabled
   );
diff --git a/src/helpers/boost/index.ts b/src/helpers/boost/index.ts
index 4414128d2..d6bece302 100644
--- a/src/helpers/boost/index.ts
+++ b/src/helpers/boost/index.ts
@@ -122,7 +122,7 @@ export async function withdrawAndBurn(
 ): Promise<any> {
   const signer = web3.getSigner();
   const contract = new Contract(BOOST_CONTRACTS[networkId], ABI, signer);
-  return await contract.burn(boostId, to);
+  return await contract.withdrawAndBurn(boostId, to);
 }
 
 export async function getFees(web3: Web3Provider, networkId: string) {
diff --git a/src/helpers/constants.ts b/src/helpers/constants.ts
index 5f43a797b..3b76d9984 100644
--- a/src/helpers/constants.ts
+++ b/src/helpers/constants.ts
@@ -95,3 +95,9 @@ export const TWO_WEEKS = 1209600;
 export const ONE_DAY = 86400;
 
 export const SNAPSHOT_HELP_LINK = 'https://help.snapshot.org/en';
+
+export const BOOST_ENABLED_VOTING_TYPES = [
+  'basic',
+  'single-choice',
+  'ranked-choice'
+];
diff --git a/src/views/SpaceBoost.vue b/src/views/SpaceBoost.vue
index a5a3c7b53..b8b9629ac 100644
--- a/src/views/SpaceBoost.vue
+++ b/src/views/SpaceBoost.vue
@@ -97,13 +97,23 @@ const isWrongNetwork = computed(() => {
   return form.value.network !== web3.value.network.key.toString();
 });
 
+const bribeEnabled = computed(() => {
+  return (
+    proposal.value.privacy !== 'shutter' &&
+    props.space.boost.bribeEnabled &&
+    ['basic', 'single-choice'].includes(proposal.value.type)
+  );
+});
+
 const eligibilityOptions = computed(() => {
   const proposalChoices = proposal.value?.choices.map(
     (choice: string, index: number) => {
       return {
         value: index + 1,
         label: `Who votes '${choice}'`,
-        extras: { disabled: !props.space.boost.bribeEnabled }
+        extras: {
+          disabled: !bribeEnabled.value
+        }
       };
     }
   );
@@ -655,14 +665,28 @@ watch(
               :items="eligibilityOptions"
               label="Eligible to"
             />
-            <TuneBlockFooter v-if="!space.boost.bribeEnabled">
+            <TuneBlockFooter v-if="!bribeEnabled">
               <BaseMessage level="info">
-                Selecting a specific choice is disabled for the
-                <span class="font-semibold">
-                  {{ space.name }}
-                </span>
-                space. Please enable strategic incentivization in the space
-                settings to enable this feature.
+                <template v-if="!space.boost.bribeEnabled">
+                  Selecting a specific choice is disabled for the
+                  <span class="font-semibold">
+                    {{ space.name }}
+                  </span>
+                  space. Please enable strategic incentivization in the space
+                  settings to enable this feature.
+                </template>
+                <template v-else-if="proposal.privacy === 'shutter'">
+                  Strategic incentivization is disabled for proposal with
+                  shutter on.
+                </template>
+                <template
+                  v-else-if="
+                    !['basic', 'single-choice'].includes(proposal.type)
+                  "
+                >
+                  Strategic incentivization is available only for basic and
+                  single choice voting type.
+                </template>
               </BaseMessage>
             </TuneBlockFooter>
           </TuneBlock>

From 88eba3073b0f0a609706b9c7f52f142b4b190fa2 Mon Sep 17 00:00:00 2001
From: Gerhard Steenkamp <51655063+gsteenkamp89@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:08:05 +0200
Subject: [PATCH 05/27] fix: only show activation button if plugin installed
 (#4691)

---
 src/components/SettingsTreasuriesBlockItemButton.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SettingsTreasuriesBlockItemButton.vue b/src/components/SettingsTreasuriesBlockItemButton.vue
index 0f40cc100..0ef56f050 100644
--- a/src/components/SettingsTreasuriesBlockItemButton.vue
+++ b/src/components/SettingsTreasuriesBlockItemButton.vue
@@ -53,9 +53,9 @@ onUnmounted(() => {
     <div class="flex items-center gap-2 truncate pr-[20px] text-left">
       <h4 class="truncate">{{ treasury.name }}</h4>
     </div>
-    <div class="ml-auto mr-3">
+    <div v-if="hasOsnapPlugin" class="ml-auto mr-3">
       <SettingsTreasuryActivateOsnapButton
-        v-if="hasOsnapPlugin && isChainSupported"
+        v-if="isChainSupported"
         :is-osnap-enabled="isOsnapEnabled"
         @click.stop="
           !isViewOnly && emit('configureOsnap', treasuryIndex, isOsnapEnabled)

From 45f1e7d71cabf0900e10ccdb13812532fc8c50e7 Mon Sep 17 00:00:00 2001
From: Usame Algan <5880855+usame-algan@users.noreply.github.com>
Date: Thu, 25 Apr 2024 18:37:33 +0200
Subject: [PATCH 06/27] fix: Use correct chainId for sepolia in walletconnect
 config (#4692)

---
 src/helpers/connectors.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers/connectors.ts b/src/helpers/connectors.ts
index 2e0fb4165..2810e27d3 100644
--- a/src/helpers/connectors.ts
+++ b/src/helpers/connectors.ts
@@ -11,7 +11,7 @@ const connectors = {
       projectId: 'e6454bd61aba40b786e866a69bd4c5c6',
       chains: [1],
       optionalChains: [
-        4, 5, 10, 42, 56, 100, 137, 246, 1088, 42161, 73799, 1115511
+        4, 5, 10, 42, 56, 100, 137, 246, 1088, 42161, 73799, 11155111
       ],
       methods: ['eth_sendTransaction', 'personal_sign', 'eth_signTypedData_v4'],
       optionalMethods: ['eth_accounts'],

From 05f362cfaa113b2e522b7bf150df0cb715844db1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:32:05 +0530
Subject: [PATCH 07/27] Update Snapshot packages (#4694)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d90d840ef..bfdbca179 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.18",
+    "@snapshot-labs/snapshot.js": "^0.11.19",
     "@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 c108df41e..9a0af39ac 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.18":
-  version "0.11.18"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.18.tgz#d8557f4204691245bdfd986e8a0cd352786954ae"
-  integrity sha512-cNCyCr007K1uMyQ/ju+VwFWlOkuEVPd+fRCWRJPpikGoLgNUuESFw+7GMPLFkGnDvVPTZ2X3vME23aAxme/h8A==
+"@snapshot-labs/snapshot.js@^0.11.19":
+  version "0.11.19"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.19.tgz#436118728a46eee4b5a973a3334bd176cd27c2ac"
+  integrity sha512-ZsakhVsz0ylFqT3WhmJwxompsZrimFml6a4T10+aMS18oLFlwW0qooiahbmeSQ6Z9A9+KKeKmHl18VbHbdZg4w==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From 1b090e4039ba1ac379cbd5c38ba382cf21c2cf51 Mon Sep 17 00:00:00 2001
From: goxibyte <denissmolonski@gmail.com>
Date: Mon, 29 Apr 2024 13:21:30 +0200
Subject: [PATCH 08/27] feature: add moonbeam safe to known hosts (#4697)

Co-authored-by: Den Smalonski <dzianis.smalonski@protofire.io>
---
 src/helpers/constants.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/helpers/constants.ts b/src/helpers/constants.ts
index 3b76d9984..e8da438f4 100644
--- a/src/helpers/constants.ts
+++ b/src/helpers/constants.ts
@@ -16,7 +16,8 @@ export const KNOWN_HOSTS = [
   'pilot.gnosisguild.org',
   'metissafe.tech',
   'multisig.mantle.xyz',
-  'wallet.ambire.com'
+  'wallet.ambire.com',
+  'multisig.moonbeam.network'
 ];
 
 export const SPACE_CATEGORIES = [

From bd50ec1dacf76238bcd4032fa5cca0b4b456105d Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Wed, 1 May 2024 17:04:42 +0530
Subject: [PATCH 09/27] fix: Privacy label name for any option (#4702)

* fix: Privacy label name for any option

* lower case
---
 src/locales/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/default.json b/src/locales/default.json
index 35777556f..ec9f37206 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -717,7 +717,7 @@
     "label": "Privacy",
     "title": "Select voting privacy",
     "information": "The type of privacy used on proposals. (Enforced on all future proposals)",
-    "any": "Any",
+    "any": "No privacy",
     "none": "None",
     "shutter": {
       "label": "Shutter",

From 39d3601f2769b4ab5816928617d14a345380f274 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 14:59:43 +0530
Subject: [PATCH 10/27] Update Snapshot packages (#4705)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index bfdbca179..d0ee6f3c5 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.19",
+    "@snapshot-labs/snapshot.js": "^0.11.20",
     "@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 9a0af39ac..7ea7db433 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.19":
-  version "0.11.19"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.19.tgz#436118728a46eee4b5a973a3334bd176cd27c2ac"
-  integrity sha512-ZsakhVsz0ylFqT3WhmJwxompsZrimFml6a4T10+aMS18oLFlwW0qooiahbmeSQ6Z9A9+KKeKmHl18VbHbdZg4w==
+"@snapshot-labs/snapshot.js@^0.11.20":
+  version "0.11.20"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.20.tgz#8a532b77406e4d292399c2f9c141f50cee182741"
+  integrity sha512-6o1IemIGBiBk5uwIfCcS+Muefm8xCqUo7+IVINDsMqorJZHVMM1dIZFDhyl72t3ZB+CErrtza2F0QrqzQjjigQ==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From 295e5784cd3301528ca5a8479154fe56b5c970b2 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Tue, 7 May 2024 19:40:40 +0530
Subject: [PATCH 11/27] fix: Not able to claim boost reward (#4710)

---
 src/components/SpaceProposalBoostClaimModalItem.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/SpaceProposalBoostClaimModalItem.vue b/src/components/SpaceProposalBoostClaimModalItem.vue
index 08bace574..7b48b006b 100644
--- a/src/components/SpaceProposalBoostClaimModalItem.vue
+++ b/src/components/SpaceProposalBoostClaimModalItem.vue
@@ -32,10 +32,7 @@ const reward = computed(() => {
     props.boost.token.decimals
   );
 
-  return formatNumber(
-    Number(amountDecimal),
-    getNumberFormatter({ maximumFractionDigits: 8 }).value
-  );
+  return amountDecimal;
 });
 
 const claim = computed(() => {
@@ -84,7 +81,13 @@ async function handleClaimAndReload() {
           {{ hasClaimed ? 'Claimed' : 'Reward' }}
         </span>
         <TuneTag class="text-skin-heading text-base">
-          {{ reward }} {{ props.boost.token.symbol }}
+          {{
+            formatNumber(
+              Number(reward),
+              getNumberFormatter({ maximumFractionDigits: 8 }).value
+            )
+          }}
+          {{ props.boost.token.symbol }}
         </TuneTag>
         <div class="mt-1 flex items-center flex-wrap">
           <span

From f6f148742c8d2ea7354fd623b36726bbb9a6f1ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 20:17:53 +0530
Subject: [PATCH 12/27] [create-pull-request] automated change (#4711)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index 76519fcd7..9d9a489ad 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit 76519fcd7d97b64da3a49f96f754a1f41f5d5258
+Subproject commit 9d9a489ad79bf8e993bd7b9813aa1570d7421c41

From d0b34fa2b90fc9039c81e8a6c7682d2811e046c8 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Sat, 11 May 2024 13:00:42 +0530
Subject: [PATCH 13/27] fix: Hide walletlink if coinbase is injected (#4713)

---
 src/components/ModalAccount.vue | 2 ++
 src/helpers/connectors.ts       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/ModalAccount.vue b/src/components/ModalAccount.vue
index a0bcb6159..5c2c80700 100644
--- a/src/components/ModalAccount.vue
+++ b/src/components/ModalAccount.vue
@@ -17,6 +17,8 @@ const injected = computed(() => getInjected());
 
 const filteredConnectors = computed(() => {
   const baseConnectors = ['injected', 'walletconnect', 'walletlink'];
+  // If injected is Coinbase, hide WalletLink
+  if (injected.value?.name === 'Coinbase') connectors.walletlink.hidden = true;
   if (isShowingAllConnectors.value) return Object.keys(connectors);
   return Object.keys(connectors).filter(cId => baseConnectors.includes(cId));
 });
diff --git a/src/helpers/connectors.ts b/src/helpers/connectors.ts
index 2810e27d3..677b87574 100644
--- a/src/helpers/connectors.ts
+++ b/src/helpers/connectors.ts
@@ -43,7 +43,8 @@ const connectors = {
       chainId: 1,
       ethJsonrpcUrl: `${import.meta.env.VITE_BROVIDER_URL}/1`
     },
-    icon: 'ipfs://QmbJKEaeMz6qR3DmJSTxtYtrZeQPptVfnnYK72QBsvAw5q'
+    icon: 'ipfs://QmbJKEaeMz6qR3DmJSTxtYtrZeQPptVfnnYK72QBsvAw5q',
+    hidden: false
   },
   portis: {
     id: 'portis',

From 941e6d8b4607eff8e255fd0b74b1126ab171fd61 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Sat, 11 May 2024 16:12:50 +0530
Subject: [PATCH 14/27] fix: Coinbase wallet issue while switching accounts in
 different tab (#4715)

---
 src/composables/useWeb3.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/composables/useWeb3.ts b/src/composables/useWeb3.ts
index 9e1e4d984..ae1c7e963 100644
--- a/src/composables/useWeb3.ts
+++ b/src/composables/useWeb3.ts
@@ -33,6 +33,7 @@ export function useWeb3() {
 
   function logout() {
     auth = getInstance();
+    if (auth.provider?.value?.isCoinbaseWallet) auth.provider.value.close();
     auth.logout();
     state.account = '';
   }

From de399215c7eec2c66c598e8a80fa29c687f6e2ad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 16:05:17 +0530
Subject: [PATCH 15/27] [create-pull-request] automated change (#4718)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index 9d9a489ad..c0666c953 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit 9d9a489ad79bf8e993bd7b9813aa1570d7421c41
+Subproject commit c0666c953199867ad2941d16abcf38891608f6a8

From 5b871591d14015ea4e67365c3c4b6ea45f570f4e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 10:14:22 +0530
Subject: [PATCH 16/27] [create-pull-request] automated change (#4720)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index c0666c953..e72213517 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit c0666c953199867ad2941d16abcf38891608f6a8
+Subproject commit e72213517570b97088926486dd8d0f8aa982b35a

From ffa3c1b80ebd865d0561fb9a78ebea37751790fa Mon Sep 17 00:00:00 2001
From: aurelianoB <mosqueraguillem@gmail.com>
Date: Wed, 15 May 2024 15:54:28 +0200
Subject: [PATCH 17/27] Whitelist alkimiexchange.eth for Boost (#4722)

---
 src/helpers/boost/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/helpers/boost/index.ts b/src/helpers/boost/index.ts
index d6bece302..31b220092 100644
--- a/src/helpers/boost/index.ts
+++ b/src/helpers/boost/index.ts
@@ -30,6 +30,7 @@ export const BOOST_WHITELIST_SETTINGS = {
     'vote.vitadao.eth',
     'shutterdao0x36.eth',
     'testeteste123.eth',
+    'alkimiexchange.eth',
     // Internal testers
     'testsnap.eth',
     'fabien.eth',

From 373ff24a66da6c5f3289892b1878a69149445c7e Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Thu, 16 May 2024 11:06:25 +0530
Subject: [PATCH 18/27] fix: Add created_gt filter to aliases query (#4721)

* fix: Add created_gt filter to aliases query

* Use spread operator
---
 src/composables/useAliasAction.ts | 13 ++++++-------
 src/helpers/queries.ts            |  6 ++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/composables/useAliasAction.ts b/src/composables/useAliasAction.ts
index 11299396c..5af755f09 100644
--- a/src/composables/useAliasAction.ts
+++ b/src/composables/useAliasAction.ts
@@ -39,7 +39,8 @@ export function useAliasAction() {
           query: ALIASES_QUERY,
           variables: {
             address: web3.value.account,
-            alias: aliasWallet.value.address
+            alias: aliasWallet.value.address,
+            created_gt: Math.floor(Date.now() / 1000) - 30 * 60 * 60 * 24
           }
         },
         'aliases'
@@ -53,12 +54,10 @@ export function useAliasAction() {
 
   async function setAlias() {
     const rndWallet = Wallet.createRandom();
-    aliases.value = Object.assign(
-      {
-        [web3.value.account]: rndWallet.privateKey
-      },
-      aliases.value
-    );
+    aliases.value = {
+      ...aliases.value,
+      [web3.value.account]: rndWallet.privateKey
+    };
     lsSet('aliases', aliases.value);
 
     if (aliasWallet.value?.address) {
diff --git a/src/helpers/queries.ts b/src/helpers/queries.ts
index aea49a45d..239aa0519 100644
--- a/src/helpers/queries.ts
+++ b/src/helpers/queries.ts
@@ -192,8 +192,10 @@ export const SUBSCRIPTIONS_QUERY = gql`
 `;
 
 export const ALIASES_QUERY = gql`
-  query Aliases($address: String!, $alias: String!) {
-    aliases(where: { address: $address, alias: $alias }) {
+  query Aliases($address: String!, $alias: String!, $created_gt: Int) {
+    aliases(
+      where: { address: $address, alias: $alias, created_gt: $created_gt }
+    ) {
       address
       alias
     }

From adced96ce08ace869d541c6c9f7d44a61be6688c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 23:39:42 +0530
Subject: [PATCH 19/27] [create-pull-request] automated change (#4723)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index e72213517..174c499a1 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit e72213517570b97088926486dd8d0f8aa982b35a
+Subproject commit 174c499a1684f5130f8204da644673bc19f36cf5

From a84c4af700c4c2cae23ba3c2f5cc5fc14e26a391 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 09:02:42 +0530
Subject: [PATCH 20/27] Update Snapshot packages (#4725)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d0ee6f3c5..7767bc95a 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.20",
+    "@snapshot-labs/snapshot.js": "^0.11.23",
     "@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 7ea7db433..d0c70f163 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.20":
-  version "0.11.20"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.20.tgz#8a532b77406e4d292399c2f9c141f50cee182741"
-  integrity sha512-6o1IemIGBiBk5uwIfCcS+Muefm8xCqUo7+IVINDsMqorJZHVMM1dIZFDhyl72t3ZB+CErrtza2F0QrqzQjjigQ==
+"@snapshot-labs/snapshot.js@^0.11.23":
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.23.tgz#d032e632ea3838a1908071571377be240cb303e2"
+  integrity sha512-td4nE5BZeePNMci9llFmbSOqLkc0seKk/iyFCTH5OLOKr7mbERu5dKei0lwAHFGa5O1w4PtXqn/HlIZVUyq+ow==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From 3ba500dfd9860e29376c874aae9984a4bd6ea116 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Mon, 20 May 2024 18:36:07 +0530
Subject: [PATCH 21/27] feat: Boost reward to winning choice (#4724)

* feat: Boost reward to winning option

* Change text
---
 src/components/SpaceProposalBoost.vue     | 14 ++++++++++--
 src/components/SpaceProposalBoostItem.vue |  5 ++++-
 src/helpers/boost/types.ts                |  2 +-
 src/views/SpaceBoost.vue                  | 27 ++++++++++++++++-------
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/components/SpaceProposalBoost.vue b/src/components/SpaceProposalBoost.vue
index 89163bd46..a737c946b 100644
--- a/src/components/SpaceProposalBoost.vue
+++ b/src/components/SpaceProposalBoost.vue
@@ -46,14 +46,24 @@ const newBoostLink = computed(() => ({
 const isActive = computed(() => props.proposal.state === 'active');
 const isFinal = computed(() => props.proposal.scores_state === 'final');
 
+const winningChoice = computed(() => {
+  const maxScore = Math.max(...props.proposal.scores);
+  const maxScoreCount = props.proposal.scores.filter(
+    score => score === maxScore
+  ).length;
+  return maxScoreCount > 1 ? 0 : props.proposal.scores.indexOf(maxScore) + 1;
+});
+
 function isEligible(boost: BoostSubgraph) {
+  const type = boost.strategy.eligibility.type;
   const choice = boost.strategy.eligibility.choice;
 
   if (!web3Account.value) return false;
   if (!isFinal.value) return false;
   if (!userVote.value) return false;
-  if (choice === null) return true;
-
+  if (type === 'prediction')
+    return userVote.value.choice.toString() === winningChoice.value.toString();
+  if (type === 'incentive' && choice === null) return true;
   return userVote.value.choice.toString() === choice;
 }
 
diff --git a/src/components/SpaceProposalBoostItem.vue b/src/components/SpaceProposalBoostItem.vue
index 16f046e3e..e3f83f3fd 100644
--- a/src/components/SpaceProposalBoostItem.vue
+++ b/src/components/SpaceProposalBoostItem.vue
@@ -242,7 +242,10 @@ const { pause } = useIntervalFn(() => {
         <div class="w-full">
           <div class="text-skin-heading flex flex-wrap -mt-1 pr-5">
             <div class="whitespace-nowrap mt-1 mr-1 flex items-center">
-              <template v-if="boost.strategy.eligibility.choice !== null">
+              <template v-if="boost.strategy.eligibility.type === 'prediction'">
+                Anyone who votes on winning choice
+              </template>
+              <template v-else-if="boost.strategy.eligibility.choice !== null">
                 Who votes
                 <div>
                   <TuneTag
diff --git a/src/helpers/boost/types.ts b/src/helpers/boost/types.ts
index 7aeeffe9d..7a6ee8070 100644
--- a/src/helpers/boost/types.ts
+++ b/src/helpers/boost/types.ts
@@ -71,7 +71,7 @@ export type BoostSubgraph = {
     name: string;
     proposal: string;
     eligibility: {
-      type: 'incentive' | 'bribe';
+      type: 'incentive' | 'prediction' | 'bribe';
       choice: string | null;
     };
     distribution: {
diff --git a/src/views/SpaceBoost.vue b/src/views/SpaceBoost.vue
index b8b9629ac..e2a469f49 100644
--- a/src/views/SpaceBoost.vue
+++ b/src/views/SpaceBoost.vue
@@ -38,7 +38,7 @@ const props = defineProps<{
 
 type Form = {
   eligibility: {
-    choice: 'any' | number;
+    choice: 'any' | 'prediction' | number;
   };
   distribution: {
     type: 'lottery' | 'weighted';
@@ -123,6 +123,10 @@ const eligibilityOptions = computed(() => {
       value: 'any',
       label: 'Anyone who votes'
     },
+    {
+      value: 'prediction',
+      label: 'Anyone who votes for the winning choice'
+    },
     ...proposalChoices
   ];
 });
@@ -206,13 +210,20 @@ const strategyDistributionLimit = computed(() => {
 });
 
 const strategy = computed<BoostStrategy>(() => {
-  const choice =
-    form.value.eligibility.choice === 'any'
-      ? undefined
-      : form.value.eligibility.choice.toString();
-
-  const eligibilityType =
-    form.value.eligibility.choice === 'any' ? 'incentive' : 'bribe';
+  let choice;
+  let eligibilityType;
+
+  switch (form.value.eligibility.choice) {
+    case 'any':
+      eligibilityType = 'incentive';
+      break;
+    case 'prediction':
+      eligibilityType = 'prediction';
+      break;
+    default:
+      choice = form.value.eligibility.choice.toString();
+      eligibilityType = 'bribe';
+  }
 
   return {
     name: 'Boost',

From 8c62584bbfc42fbc3f82542eda1f0c07a7911f2a Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Mon, 20 May 2024 23:59:59 +0400
Subject: [PATCH 22/27] feat: add `network` params to follow/unfollow sign
 (#4712)

* feat: add `network` params to follow/unfollow sign

* fix: use different default network depending on env
---
 src/composables/useFollowSpace.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/composables/useFollowSpace.ts b/src/composables/useFollowSpace.ts
index 19de76c11..cb816074d 100644
--- a/src/composables/useFollowSpace.ts
+++ b/src/composables/useFollowSpace.ts
@@ -63,12 +63,15 @@ export function useFollowSpace(spaceId: any = {}) {
 
   async function follow(space) {
     loadingFollow.value = spaceId;
+
     try {
       await checkAlias();
       if (!aliasWallet.value || !isValidAlias.value) {
         await setAlias();
         follow(space);
       } else {
+        const network = process.env.VITE_ENV === 'production' ? 's' : 's-tn';
+
         if (isFollowing.value) {
           // Also unsubscribe to the notifications if the user leaves the space.
           if (isSubscribed.value) {
@@ -76,12 +79,14 @@ export function useFollowSpace(spaceId: any = {}) {
           }
           await client.unfollow(aliasWallet.value, aliasWallet.value.address, {
             from: web3Account.value,
-            space
+            space,
+            network
           });
         } else {
           await client.follow(aliasWallet.value, aliasWallet.value.address, {
             from: web3Account.value,
-            space
+            space,
+            network
           });
         }
         await loadFollows();

From 059fd57dbd56dd16f81496dfdb036942152d7e04 Mon Sep 17 00:00:00 2001
From: aurelianoB <mosqueraguillem@gmail.com>
Date: Wed, 22 May 2024 12:08:23 +0200
Subject: [PATCH 23/27] fix: grammar of boost winning choice (#4731)

---
 src/components/SpaceProposalBoostItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SpaceProposalBoostItem.vue b/src/components/SpaceProposalBoostItem.vue
index e3f83f3fd..84f020377 100644
--- a/src/components/SpaceProposalBoostItem.vue
+++ b/src/components/SpaceProposalBoostItem.vue
@@ -243,7 +243,7 @@ const { pause } = useIntervalFn(() => {
           <div class="text-skin-heading flex flex-wrap -mt-1 pr-5">
             <div class="whitespace-nowrap mt-1 mr-1 flex items-center">
               <template v-if="boost.strategy.eligibility.type === 'prediction'">
-                Anyone who votes on winning choice
+                Anyone who votes for the winning choice
               </template>
               <template v-else-if="boost.strategy.eligibility.choice !== null">
                 Who votes

From 60e9788391c6225110823c3c728651aa3eaaa537 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 22:30:20 +0530
Subject: [PATCH 24/27] [create-pull-request] automated change (#4732)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index 174c499a1..cc5d2d158 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit 174c499a1684f5130f8204da644673bc19f36cf5
+Subproject commit cc5d2d158a28d514f966f1bbe48d8d3088dd7acb

From 284ca146e70a70c2b151ff00fdf671a0cf83224b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 13:24:31 +0530
Subject: [PATCH 25/27] [create-pull-request] automated change (#4733)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 snapshot-spaces | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapshot-spaces b/snapshot-spaces
index cc5d2d158..6fbb20648 160000
--- a/snapshot-spaces
+++ b/snapshot-spaces
@@ -1 +1 @@
-Subproject commit cc5d2d158a28d514f966f1bbe48d8d3088dd7acb
+Subproject commit 6fbb206480132ac20c02440c74f6f275c65af038

From ac0d5a36de0683980e406509279dfd202f7b2e80 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 17:48:13 +0530
Subject: [PATCH 26/27] Update Snapshot packages (#4734)

Co-authored-by: ChaituVR <ChaituVR@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7767bc95a..e7add0675 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.23",
+    "@snapshot-labs/snapshot.js": "^0.11.24",
     "@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 d0c70f163..23bd1a8e8 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.23":
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.23.tgz#d032e632ea3838a1908071571377be240cb303e2"
-  integrity sha512-td4nE5BZeePNMci9llFmbSOqLkc0seKk/iyFCTH5OLOKr7mbERu5dKei0lwAHFGa5O1w4PtXqn/HlIZVUyq+ow==
+"@snapshot-labs/snapshot.js@^0.11.24":
+  version "0.11.24"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.11.24.tgz#013d9306236dd0a74ac8bcb31a14c5edbd68a960"
+  integrity sha512-LORRX/0zFdy4pRMWLjoOEh0wB0foNjpxovKi3V5uho5RDB73V5sUSoj3NG4pmz/ZyQREAyqma2/LgpJqyHcirQ==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From 0bc4eba033315638172aac2185bcde668578a829 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 26 May 2024 19:56:35 +0400
Subject: [PATCH 27/27] fix: use the updated url for treasury token list
 (#4736)

---
 src/composables/useTreasury.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/useTreasury.ts b/src/composables/useTreasury.ts
index def4f472c..1b9dffbaa 100644
--- a/src/composables/useTreasury.ts
+++ b/src/composables/useTreasury.ts
@@ -2,7 +2,7 @@ import snapshot from '@snapshot-labs/snapshot.js';
 import { getTokenBalances, ETHER_CONTRACT } from '@/helpers/covalent';
 import { TreasuryAsset } from '@/helpers/interfaces';
 
-const TOKEN_LIST_URL = 'https://gateway.ipfs.io/ipns/tokens.uniswap.org';
+const TOKEN_LIST_URL = 'https://ipfs.io/ipns/tokens.uniswap.org';
 
 const tokenListContractAddresses = ref<null | string[]>(null);
 const treasuryAssets = ref<{ [key: string]: TreasuryAsset[] }>({});