From db2dde33c96b403c8b5848890c9711da4bcbeadd Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 25 Oct 2024 00:30:00 +0400
Subject: [PATCH 01/59] fix: enable offchain proposal update (#935)

* fix: enable edit menu for offchain proposal

* fix: redirect to offchain proposal page after update

* fix: more compact code

---------

Co-authored-by: Chaitanya <yourchaitu@gmail.com>
---
 apps/ui/src/views/Proposal/Overview.vue |  9 +++++++--
 apps/ui/src/views/Space/Editor.vue      | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/views/Proposal/Overview.vue b/apps/ui/src/views/Proposal/Overview.vue
index eb59ffc40..ab08f9595 100644
--- a/apps/ui/src/views/Proposal/Overview.vue
+++ b/apps/ui/src/views/Proposal/Overview.vue
@@ -46,11 +46,15 @@ const cancelling = ref(false);
 const aiSummaryOpen = ref(false);
 
 const editable = computed(() => {
-  // HACK: here we need to use snapshot instead of start because start is artifically
+  // HACK: here we need to use snapshot instead of start because start is artificially
   // shifted for Starknet's proposals with ERC20Votes strategies.
+  const pivotName = offchainNetworks.includes(props.proposal.network)
+    ? 'start'
+    : 'snapshot';
+
   return (
     compareAddresses(props.proposal.author.id, web3.value.account) &&
-    props.proposal.snapshot >
+    props.proposal[pivotName] >
       (getCurrent(props.proposal.network) || Number.POSITIVE_INFINITY)
   );
 });
@@ -123,6 +127,7 @@ async function handleEditClick() {
     discussion: props.proposal.discussion,
     type: props.proposal.type,
     choices: props.proposal.choices,
+    labels: props.proposal.labels,
     executions
   });
 
diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
index 77751c5be..af5b8e5ed 100644
--- a/apps/ui/src/views/Space/Editor.vue
+++ b/apps/ui/src/views/Space/Editor.vue
@@ -216,9 +216,20 @@ async function handleProposeClick() {
     }
     if (result) {
       proposalsStore.reset(props.space.id, props.space.network);
-      router.push({
-        name: 'space-proposals'
-      });
+
+      if (
+        proposal.value.proposalId &&
+        offchainNetworks.includes(props.space.network)
+      ) {
+        router.push({
+          name: 'space-proposal-overview',
+          params: {
+            proposal: proposal.value.proposalId
+          }
+        });
+      } else {
+        router.push({ name: 'space-proposals' });
+      }
     }
   } finally {
     sending.value = false;

From a1555a97a7deb0818c7f94c8638cba8b9a20d6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Fri, 25 Oct 2024 13:42:32 +0200
Subject: [PATCH 02/59] chore: bump subgraph-api to 0.0.43 (#930)

---
 apps/subgraph-api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/subgraph-api/package.json b/apps/subgraph-api/package.json
index 4235bd966..6e68dcfc8 100644
--- a/apps/subgraph-api/package.json
+++ b/apps/subgraph-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "api-subgraph",
   "private": true,
-  "version": "0.0.42",
+  "version": "0.0.43",
   "scripts": {
     "test": "graph test",
     "codegen": "graph codegen",

From 8114aa11409fd44611544e60b90d88b2a969179a Mon Sep 17 00:00:00 2001
From: Less <bonustrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 18:50:13 +0700
Subject: [PATCH 03/59] feat: support custom label for basic voting (#868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: support custom label for basic voting

* feat: display custom choice labels

* feat: use custom choices in vote modal

* feat: show choice icon on proposal edit

* feat: use custom choices for onchain proposals

* feat: prevent deleting non-optional choices

* feat: prevent adding more choices

* feat: show delete button when possible

* feat: use custom plcaeholder for basic choices

* feat: handle proposals without abstain

---------

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>
---
 apps/ui/src/components/EditorChoices.vue      | 56 ++++++++++++++++---
 apps/ui/src/components/ProposalResults.vue    |  8 +--
 apps/ui/src/components/ProposalVote.vue       | 31 ++++++++--
 apps/ui/src/components/ProposalVoteBasic.vue  |  7 ++-
 apps/ui/src/components/ProposalsListItem.vue  |  1 +
 apps/ui/src/composables/useEditor.ts          |  6 +-
 apps/ui/src/helpers/utils.ts                  | 10 +++-
 .../src/networks/common/graphqlApi/index.ts   |  4 +-
 .../src/networks/common/graphqlApi/queries.ts |  1 +
 .../src/networks/common/graphqlApi/types.ts   |  1 +
 apps/ui/src/views/Proposal.vue                |  1 +
 apps/ui/src/views/Space/Editor.vue            |  7 ++-
 12 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/apps/ui/src/components/EditorChoices.vue b/apps/ui/src/components/EditorChoices.vue
index 594c8b1a8..109435a0c 100644
--- a/apps/ui/src/components/EditorChoices.vue
+++ b/apps/ui/src/components/EditorChoices.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable';
+import { BASIC_CHOICES } from '@/helpers/constants';
 import { Draft } from '@/types';
 
 const proposal = defineModel<Draft>({ required: true });
 
 const props = defineProps<{
+  minimumBasicChoices: number;
   error?: string;
   definition: any;
 }>();
@@ -18,6 +20,10 @@ function handleAddChoice() {
 }
 
 function handlePressEnter(index: number) {
+  if (proposal.value.type === 'basic' && proposal.value.choices.length === 3) {
+    return;
+  }
+
   if (!choices.value[index + 1]) return handleAddChoice();
 
   nextTick(() => choices.value[index + 1].focus());
@@ -27,12 +33,33 @@ function handlePressDelete(event: KeyboardEvent, index: number) {
   if (proposal.value.choices[index] === '') {
     event.preventDefault();
 
-    if (index !== 0) {
+    const canDelete =
+      proposal.value.type === 'basic'
+        ? proposal.value.choices.length > props.minimumBasicChoices
+        : true;
+
+    if (canDelete && index !== 0) {
       proposal.value.choices.splice(index, 1);
       nextTick(() => choices.value[index - 1].focus());
     }
   }
 }
+
+function getPlaceholderText(index: number) {
+  if (proposal.value.type === 'basic' && index < 3) {
+    return BASIC_CHOICES[index];
+  }
+
+  return `Choice ${index + 1}`;
+}
+
+function shouldHaveDeleteButton(index: number) {
+  if (proposal.value.type === 'basic') {
+    return index > props.minimumBasicChoices - 1;
+  }
+
+  return proposal.value.choices.length > 1;
+}
 </script>
 
 <template>
@@ -62,6 +89,25 @@ function handlePressDelete(event: KeyboardEvent, index: number) {
               >
                 <IC-drag />
               </div>
+              <div v-else class="mt-1.5">
+                <div
+                  class="shrink-0 rounded-full choice-bg inline-block size-[18px]"
+                  :class="`_${index + 1}`"
+                >
+                  <IH-check
+                    v-if="index === 0"
+                    class="text-white size-[14px] mt-0.5 ml-0.5"
+                  />
+                  <IH-x
+                    v-else-if="index === 1"
+                    class="text-white size-[14px] mt-0.5 ml-0.5"
+                  />
+                  <IH-minus-sm
+                    v-else-if="index === 2"
+                    class="text-white size-[14px] mt-0.5 ml-0.5"
+                  />
+                </div>
+              </div>
               <div class="grow">
                 <input
                   :ref="el => (choices[index] = el)"
@@ -69,17 +115,13 @@ function handlePressDelete(event: KeyboardEvent, index: number) {
                   type="text"
                   :maxLength="definition.items[0].maxLength"
                   class="w-full h-[40px] py-[10px] bg-transparent text-skin-heading"
-                  :class="{
-                    '!cursor-not-allowed ml-1': proposal.type === 'basic'
-                  }"
-                  :placeholder="`Choice ${index + 1}`"
-                  :disabled="proposal.type === 'basic'"
+                  :placeholder="getPlaceholderText(index)"
                   @keyup.enter="handlePressEnter(index)"
                   @keydown.delete="e => handlePressDelete(e, index)"
                 />
               </div>
               <UiButton
-                v-if="proposal.choices.length > 1 && proposal.type !== 'basic'"
+                v-if="shouldHaveDeleteButton(index)"
                 class="!border-0 !rounded-l-none !rounded-r-lg !bg-transparent !size-[40px] !px-0 !text-skin-text shrink-0"
                 @click="proposal.choices.splice(index, 1)"
               >
diff --git a/apps/ui/src/components/ProposalResults.vue b/apps/ui/src/components/ProposalResults.vue
index b639cbae5..244aaf81c 100644
--- a/apps/ui/src/components/ProposalResults.vue
+++ b/apps/ui/src/components/ProposalResults.vue
@@ -25,12 +25,6 @@ const props = withDefaults(
   }
 );
 
-const LABELS = {
-  0: 'For',
-  1: 'Against',
-  2: 'Abstain'
-};
-
 const displayAllChoices = ref(false);
 
 const totalProgress = computed(() => quorumProgress(props.proposal));
@@ -209,7 +203,7 @@ const otherResultsSummary = computed(() => {
         <div
           v-for="result in results"
           :key="result.choice"
-          :title="LABELS[result.choice - 1]"
+          :title="props.proposal.choices[result.choice - 1]"
           class="choice-bg float-left h-full"
           :style="{
             width: `${quorumChoiceProgress(props.proposal.quorum_type, result, totalProgress).toFixed(3)}%`
diff --git a/apps/ui/src/components/ProposalVote.vue b/apps/ui/src/components/ProposalVote.vue
index f249dedd9..3f84fb3a3 100644
--- a/apps/ui/src/components/ProposalVote.vue
+++ b/apps/ui/src/components/ProposalVote.vue
@@ -69,12 +69,31 @@ const isEditable = computed(() => {
         <IH-lock-closed class="size-[16px] shrink-0" />
         <span class="truncate">Encrypted choice</span>
       </div>
-      <div
-        v-else
-        class="grow truncate"
-        :class="{ 'text-skin-text': !isEditable }"
-        v-text="getChoiceText(proposal.choices, currentVote.choice)"
-      />
+      <div v-else class="flex items-center gap-2">
+        <div
+          v-if="proposal.type === 'basic'"
+          class="shrink-0 rounded-full choice-bg inline-block size-[18px]"
+          :class="`_${currentVote.choice}`"
+        >
+          <IH-check
+            v-if="currentVote.choice === 1"
+            class="text-white size-[14px] mt-0.5 ml-0.5"
+          />
+          <IH-x
+            v-else-if="currentVote.choice === 2"
+            class="text-white size-[14px] mt-0.5 ml-0.5"
+          />
+          <IH-minus-sm
+            v-else-if="currentVote.choice === 3"
+            class="text-white size-[14px] mt-0.5 ml-0.5"
+          />
+        </div>
+        <div
+          class="grow truncate"
+          :class="{ 'text-skin-text': !isEditable }"
+          v-text="getChoiceText(proposal.choices, currentVote.choice)"
+        />
+      </div>
       <IH-pencil v-if="isEditable" class="shrink-0" />
     </UiButton>
   </slot>
diff --git a/apps/ui/src/components/ProposalVoteBasic.vue b/apps/ui/src/components/ProposalVoteBasic.vue
index da0c9dba5..d64aae571 100644
--- a/apps/ui/src/components/ProposalVoteBasic.vue
+++ b/apps/ui/src/components/ProposalVoteBasic.vue
@@ -4,6 +4,7 @@ import { Choice } from '@/types';
 withDefaults(
   defineProps<{
     size?: number;
+    choices: string[];
   }>(),
   { size: 48 }
 );
@@ -15,7 +16,7 @@ const emit = defineEmits<{
 
 <template>
   <div class="flex space-x-2">
-    <UiTooltip title="For">
+    <UiTooltip :title="choices[0]">
       <UiButton
         class="!text-skin-success !border-skin-success !px-0"
         :class="{
@@ -27,7 +28,7 @@ const emit = defineEmits<{
         <IH-check class="inline-block" />
       </UiButton>
     </UiTooltip>
-    <UiTooltip title="Against">
+    <UiTooltip :title="choices[1]">
       <UiButton
         class="!text-skin-danger !border-skin-danger !px-0"
         :class="{
@@ -39,7 +40,7 @@ const emit = defineEmits<{
         <IH-x class="inline-block" />
       </UiButton>
     </UiTooltip>
-    <UiTooltip title="Abstain">
+    <UiTooltip v-if="choices.length === 3" :title="choices[2]">
       <UiButton
         class="!text-gray-500 !border-gray-500 !px-0"
         :class="{
diff --git a/apps/ui/src/components/ProposalsListItem.vue b/apps/ui/src/components/ProposalsListItem.vue
index 7da64b076..cef4dfae4 100644
--- a/apps/ui/src/components/ProposalsListItem.vue
+++ b/apps/ui/src/components/ProposalsListItem.vue
@@ -55,6 +55,7 @@ const handleVoteClick = (choice: Choice) => {
           </template>
           <ProposalVoteBasic
             v-if="proposal.type === 'basic'"
+            :choices="proposal.choices"
             :size="40"
             class="py-2"
             @vote="handleVoteClick"
diff --git a/apps/ui/src/composables/useEditor.ts b/apps/ui/src/composables/useEditor.ts
index 128235be5..eb3158ef1 100644
--- a/apps/ui/src/composables/useEditor.ts
+++ b/apps/ui/src/composables/useEditor.ts
@@ -1,8 +1,8 @@
 import { BASIC_CHOICES } from '@/helpers/constants';
-import { lsGet, lsSet, omit } from '@/helpers/utils';
+import { clone, lsGet, lsSet, omit } from '@/helpers/utils';
 import { Draft, Drafts, VoteType } from '@/types';
 
-const PREFERRED_VOTE_TYPE = 'single-choice';
+const PREFERRED_VOTE_TYPE = 'basic';
 
 const storedProposals = lsGet('proposals', {});
 const processedProposals = Object.fromEntries(
@@ -117,7 +117,7 @@ export function useEditor() {
     await setSpacesVoteType([spaceId]);
 
     const type = payload?.type || spaceVoteType.get(spaceId)!;
-    const choices = type === 'basic' ? BASIC_CHOICES : Array(2).fill('');
+    const choices = type === 'basic' ? clone(BASIC_CHOICES) : Array(2).fill('');
 
     const id = draftKey ?? generateId();
     const key = `${spaceId}:${id}`;
diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
index 19af6367f..9e7ec23fb 100644
--- a/apps/ui/src/helpers/utils.ts
+++ b/apps/ui/src/helpers/utils.ts
@@ -538,8 +538,14 @@ export function getChoiceWeight(
 
 export function getChoiceText(availableChoices: string[], choice: Choice) {
   if (typeof choice === 'string') {
-    return ['for', 'against', 'abstain'].includes(choice)
-      ? choice.charAt(0).toUpperCase() + choice.slice(1)
+    const basicChoices = {
+      for: 0,
+      against: 1,
+      abstain: 2
+    };
+
+    return basicChoices[choice] !== undefined
+      ? availableChoices[basicChoices[choice]]
       : 'Invalid choice';
   }
 
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index 7ea5f6018..42bb72afe 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -3,7 +3,7 @@ import {
   createHttpLink,
   InMemoryCache
 } from '@apollo/client/core';
-import { BASIC_CHOICES, CHAIN_IDS } from '@/helpers/constants';
+import { CHAIN_IDS } from '@/helpers/constants';
 import { getNames } from '@/helpers/stamp';
 import { clone, compareAddresses } from '@/helpers/utils';
 import {
@@ -258,7 +258,7 @@ function formatProposal(
     },
     metadata_uri: proposal.metadata.id,
     type: 'basic',
-    choices: BASIC_CHOICES,
+    choices: proposal.metadata.choices,
     labels: proposal.metadata.labels,
     scores: [proposal.scores_1, proposal.scores_2, proposal.scores_3],
     title: proposal.metadata.title ?? '',
diff --git a/apps/ui/src/networks/common/graphqlApi/queries.ts b/apps/ui/src/networks/common/graphqlApi/queries.ts
index eb6750452..7b44d6b1c 100644
--- a/apps/ui/src/networks/common/graphqlApi/queries.ts
+++ b/apps/ui/src/networks/common/graphqlApi/queries.ts
@@ -123,6 +123,7 @@ const PROPOSAL_FRAGMENT = gql`
       body
       discussion
       execution
+      choices
       labels
     }
     start
diff --git a/apps/ui/src/networks/common/graphqlApi/types.ts b/apps/ui/src/networks/common/graphqlApi/types.ts
index 0745825f2..fbeaab8ec 100644
--- a/apps/ui/src/networks/common/graphqlApi/types.ts
+++ b/apps/ui/src/networks/common/graphqlApi/types.ts
@@ -72,6 +72,7 @@ export type ApiProposal = {
     body: string | null;
     discussion: string | null;
     execution: string | null;
+    choices: string[];
     labels: string[];
   };
   space: {
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
index ee3a7eb4c..a998f2cc7 100644
--- a/apps/ui/src/views/Proposal.vue
+++ b/apps/ui/src/views/Proposal.vue
@@ -279,6 +279,7 @@ watchEffect(() => {
               >
                 <ProposalVoteBasic
                   v-if="proposal.type === 'basic'"
+                  :choices="proposal.choices"
                   @vote="handleVoteClick"
                 />
                 <ProposalVoteSingleChoice
diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
index af5b8e5ed..ce5d84527 100644
--- a/apps/ui/src/views/Space/Editor.vue
+++ b/apps/ui/src/views/Space/Editor.vue
@@ -115,7 +115,7 @@ const bodyDefinition = computed(() => ({
 const choicesDefinition = computed(() => ({
   type: 'array',
   title: 'Choices',
-  minItems: 1,
+  minItems: offchainNetworks.includes(props.space.network) ? 2 : 3,
   maxItems: MAX_CHOICES[props.space.turbo ? 'turbo' : 'default'],
   items: [{ type: 'string', minLength: 1, maxLength: 32 }],
   additionalItems: { type: 'string', maxLength: 32 }
@@ -141,7 +141,7 @@ const formErrors = computed(() => {
       title: proposal.value.title,
       body: proposal.value.body,
       discussion: proposal.value.discussion,
-      choices: proposal.value.choices
+      choices: proposal.value.choices.filter(choice => !!choice)
     },
     {
       skipEmptyOptionalFields: true
@@ -498,6 +498,9 @@ watchEffect(() => {
       />
       <EditorChoices
         v-model="proposal"
+        :minimum-basic-choices="
+          offchainNetworks.includes(space.network) ? 2 : 3
+        "
         :definition="choicesDefinition"
         :error="
           proposal.choices.length > choicesDefinition.maxItems

From 7752a50cb67907986479cfeb6300a87db5904836 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:18:58 +0400
Subject: [PATCH 04/59] fix: remove linea network (#943)

* fix: remove linea network

* fix: keep ADDABLE_NETWORKS logic
---
 apps/mana/src/eth/rpc.ts            |  4 +---
 apps/subgraph-api/networks.json     | 10 ----------
 apps/subgraph-api/package.json      |  1 -
 apps/subgraph-api/src/mapping.ts    |  1 -
 apps/ui/src/helpers/constants.ts    |  1 -
 apps/ui/src/helpers/etherscan.ts    |  1 -
 apps/ui/src/helpers/networks.json   |  6 ------
 apps/ui/src/helpers/utils.ts        | 23 ++++++++++++-----------
 apps/ui/src/networks/evm/actions.ts |  4 +---
 apps/ui/src/networks/evm/index.ts   |  9 ---------
 apps/ui/src/networks/index.ts       | 11 +----------
 apps/ui/src/types.ts                |  1 -
 packages/sx.js/src/evmNetworks.ts   | 29 +----------------------------
 13 files changed, 16 insertions(+), 85 deletions(-)

diff --git a/apps/mana/src/eth/rpc.ts b/apps/mana/src/eth/rpc.ts
index cb64930cc..1c9e6d522 100644
--- a/apps/mana/src/eth/rpc.ts
+++ b/apps/mana/src/eth/rpc.ts
@@ -1,7 +1,6 @@
 import {
   clients,
   evmArbitrum,
-  evmLineaGoerli,
   evmMainnet,
   EvmNetworkConfig,
   evmOptimism,
@@ -18,8 +17,7 @@ export const NETWORKS = new Map<number, EvmNetworkConfig>([
   [137, evmPolygon],
   [42161, evmArbitrum],
   [1, evmMainnet],
-  [11155111, evmSepolia],
-  [59140, evmLineaGoerli]
+  [11155111, evmSepolia]
 ]);
 
 export const createNetworkHandler = (chainId: number) => {
diff --git a/apps/subgraph-api/networks.json b/apps/subgraph-api/networks.json
index c7a9f0cd0..456e9b59f 100644
--- a/apps/subgraph-api/networks.json
+++ b/apps/subgraph-api/networks.json
@@ -48,15 +48,5 @@
       "address": "0x0000000000021210000000000000000000000000",
       "startBlock": 157825417
     }
-  },
-  "linea-testnet": {
-    "ProxyFactory": {
-      "address": "0x12A1FfFFfd70677939D61d641eA043bc9060c718",
-      "startBlock": 858097
-    },
-    "L1AvatarExecutionStrategyFactory": {
-      "address": "0x0000000000021210000000000000000000000000",
-      "startBlock": 858097
-    }
   }
 }
diff --git a/apps/subgraph-api/package.json b/apps/subgraph-api/package.json
index 6e68dcfc8..e44bb5304 100644
--- a/apps/subgraph-api/package.json
+++ b/apps/subgraph-api/package.json
@@ -11,7 +11,6 @@
     "create-local": "graph create --node http://localhost:8020/ snapshot-labs/sx-subgraph",
     "remove-local": "graph remove --node http://localhost:8020/ snapshot-labs/sx-subgraph",
     "deploy-local": "yarn create-local && graph deploy --node http://localhost:8020/ --network sepolia -l `LC_ALL=C tr -dc a-z0-9 </dev/urandom | head -c 32` snapshot-labs/sx-subgraph",
-    "deploy-linea-testnet": "graph deploy --network linea-testnet --studio sx-linea-testnet",
     "deploy-studio": "graph deploy --studio -l v${npm_package_version}",
     "deploy-studio-mainnet": "yarn deploy-studio --network mainnet sx",
     "deploy-studio-sepolia": "yarn deploy-studio --network sepolia sx-sepolia",
diff --git a/apps/subgraph-api/src/mapping.ts b/apps/subgraph-api/src/mapping.ts
index 3ab43671a..0b7022041 100644
--- a/apps/subgraph-api/src/mapping.ts
+++ b/apps/subgraph-api/src/mapping.ts
@@ -66,7 +66,6 @@ CHAIN_IDS.set('sepolia', 11155111)
 CHAIN_IDS.set('optimism', 10)
 CHAIN_IDS.set('matic', 137)
 CHAIN_IDS.set('arbitrum-one', 42161)
-CHAIN_IDS.set('linea-testnet', 59140)
 
 export function handleProxyDeployed(event: ProxyDeployed): void {
   let network = dataSource.network()
diff --git a/apps/ui/src/helpers/constants.ts b/apps/ui/src/helpers/constants.ts
index 162bcd8fb..7b0b9c730 100644
--- a/apps/ui/src/helpers/constants.ts
+++ b/apps/ui/src/helpers/constants.ts
@@ -12,7 +12,6 @@ export const CHAIN_IDS: Record<Exclude<NetworkID, 's' | 's-tn'>, ChainId> = {
   oeth: 10,
   matic: 137,
   arb1: 42161,
-  'linea-testnet': 59140,
   sep: 11155111,
   // Starknet
   sn: '0x534e5f4d41494e',
diff --git a/apps/ui/src/helpers/etherscan.ts b/apps/ui/src/helpers/etherscan.ts
index 29762e9ef..8fa7664a2 100644
--- a/apps/ui/src/helpers/etherscan.ts
+++ b/apps/ui/src/helpers/etherscan.ts
@@ -4,7 +4,6 @@ export async function getABI(chainId: number, address: string) {
   else if (chainId === 10) apiHost = 'https://api-optimistic.etherscan.io';
   else if (chainId === 137) apiHost = 'https://api.polygonscan.com';
   else if (chainId === 42161) apiHost = 'https://api.arbiscan.io';
-  else if (chainId === 59140) apiHost = 'https://api.lineascan.build';
   else if (chainId === 11155111) apiHost = 'https://api-sepolia.etherscan.io';
   else throw new Error('Unsupported chainId');
 
diff --git a/apps/ui/src/helpers/networks.json b/apps/ui/src/helpers/networks.json
index 7c14cde6b..ed66c4203 100644
--- a/apps/ui/src/helpers/networks.json
+++ b/apps/ui/src/helpers/networks.json
@@ -52,11 +52,5 @@
     "chainId": 11155111,
     "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "explorer": "https://sepolia.etherscan.io"
-  },
-  "59140": {
-    "key": "59140",
-    "chainId": 59140,
-    "multicall": "0x77dca2c955b15e9de4dbbcf1246b4b85b651e50e",
-    "explorer": "https://goerli.lineascan.build"
   }
 }
diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
index 9e7ec23fb..6e7d4f3e2 100644
--- a/apps/ui/src/helpers/utils.ts
+++ b/apps/ui/src/helpers/utils.ts
@@ -28,16 +28,16 @@ import IHGlobeAlt from '~icons/heroicons-outline/globe-alt';
 const IPFS_GATEWAY: string =
   import.meta.env.VITE_IPFS_GATEWAY || 'https://cloudflare-ipfs.com';
 const ADDABLE_NETWORKS = {
-  59140: {
-    chainName: 'Linea Goerli test network',
-    nativeCurrency: {
-      name: 'LineaETH',
-      symbol: 'ETH',
-      decimals: 18
-    },
-    rpcUrls: ['https://rpc.goerli.linea.build'],
-    blockExplorerUrls: ['https://goerli.lineascan.build']
-  }
+  //   12345: {
+  //     chainName: 'My network name',
+  //     nativeCurrency: {
+  //       name: 'MyNetwork',
+  //       symbol: 'NTW',
+  //       decimals: 18
+  //     },
+  //     rpcUrls: ['https://...'],
+  //     blockExplorerUrls: ['https://...']
+  //   }
 };
 
 dayjs.extend(relativeTime);
@@ -371,7 +371,8 @@ export async function verifyNetwork(
       params: [{ chainId: encodedChainId }]
     });
   } catch (err) {
-    if (err.code !== 4902 || !ADDABLE_NETWORKS) throw new Error(err.message);
+    if (err.code !== 4902 || !ADDABLE_NETWORKS[chainId])
+      throw new Error(err.message);
 
     await web3Provider.provider.request({
       method: 'wallet_addEthereumChain',
diff --git a/apps/ui/src/networks/evm/actions.ts b/apps/ui/src/networks/evm/actions.ts
index 5659c078e..0c92c7be1 100644
--- a/apps/ui/src/networks/evm/actions.ts
+++ b/apps/ui/src/networks/evm/actions.ts
@@ -4,7 +4,6 @@ import { formatBytes32String } from '@ethersproject/strings';
 import {
   clients,
   evmArbitrum,
-  evmLineaGoerli,
   evmMainnet,
   EvmNetworkConfig,
   evmOptimism,
@@ -52,8 +51,7 @@ const CONFIGS: Record<number, EvmNetworkConfig> = {
   137: evmPolygon,
   42161: evmArbitrum,
   1: evmMainnet,
-  11155111: evmSepolia,
-  59140: evmLineaGoerli
+  11155111: evmSepolia
 };
 
 export function createActions(
diff --git a/apps/ui/src/networks/evm/index.ts b/apps/ui/src/networks/evm/index.ts
index e5283fc22..2e704f241 100644
--- a/apps/ui/src/networks/evm/index.ts
+++ b/apps/ui/src/networks/evm/index.ts
@@ -67,15 +67,6 @@ export const METADATA: Record<string, Metadata> = {
     avatar:
       'ipfs://bafkreid7ndxh6y2ljw2jhbisodiyrhcy2udvnwqgon5wgells3kh4si5z4',
     blockTime: 13.2816
-  },
-  'linea-testnet': {
-    name: 'Linea testnet',
-    chainId: 59140,
-    apiUrl:
-      'https://thegraph.goerli.zkevm.consensys.net/subgraphs/name/snapshot-labs/sx-subgraph',
-    avatar:
-      'ipfs://bafkreibn4mjs54bnmvkrkiaiwp47gvcz6bervg2kr5ubknytfyz6l5wbs4',
-    blockTime: 13.52926
   }
 };
 
diff --git a/apps/ui/src/networks/index.ts b/apps/ui/src/networks/index.ts
index 6324d1188..84a87001e 100644
--- a/apps/ui/src/networks/index.ts
+++ b/apps/ui/src/networks/index.ts
@@ -13,21 +13,13 @@ const arbitrumNetwork = createEvmNetwork('arb1');
 const optimismNetwork = createEvmNetwork('oeth');
 const ethereumNetwork = createEvmNetwork('eth');
 const sepoliaNetwork = createEvmNetwork('sep');
-const lineaTestnetNetwork = createEvmNetwork('linea-testnet');
 
 export const enabledNetworks: NetworkID[] = import.meta.env
   .VITE_ENABLED_NETWORKS
   ? (import.meta.env.VITE_ENABLED_NETWORKS.split(',') as NetworkID[])
   : ['s', 's-tn', 'eth', 'matic', 'arb1', 'oeth', 'sep', 'sn', 'sn-sep'];
 
-export const evmNetworks: NetworkID[] = [
-  'eth',
-  'matic',
-  'arb1',
-  'oeth',
-  'sep',
-  'linea-testnet'
-];
+export const evmNetworks: NetworkID[] = ['eth', 'matic', 'arb1', 'oeth', 'sep'];
 export const offchainNetworks: NetworkID[] = ['s', 's-tn'];
 export const starknetNetworks: NetworkID[] = ['sn', 'sn-sep'];
 // This network is used for aliases/follows/profiles/explore page.
@@ -45,7 +37,6 @@ export const getNetwork = (id: NetworkID) => {
   if (id === 'oeth') return optimismNetwork;
   if (id === 'eth') return ethereumNetwork;
   if (id === 'sep') return sepoliaNetwork;
-  if (id === 'linea-testnet') return lineaTestnetNetwork;
   if (id === 'sn') return starknetNetwork;
   if (id === 'sn-sep') return starknetSepoliaNetwork;
 
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index 81873388d..1058ee10a 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -19,7 +19,6 @@ export type NetworkID =
   | 'arb1'
   | 'oeth'
   | 'sep'
-  | 'linea-testnet'
   | 'sn'
   | 'sn-sep';
 
diff --git a/packages/sx.js/src/evmNetworks.ts b/packages/sx.js/src/evmNetworks.ts
index 241142edc..3faf047c2 100644
--- a/packages/sx.js/src/evmNetworks.ts
+++ b/packages/sx.js/src/evmNetworks.ts
@@ -106,33 +106,7 @@ export const evmNetworks = {
     }
   }),
   matic: createStandardConfig(137),
-  arb1: createStandardConfig(42161),
-  'linea-testnet': {
-    Meta: {
-      eip712ChainId: 59140,
-      proxyFactory: '0x12A1FfFFfd70677939D61d641eA043bc9060c718',
-      masterSpace: '0x7cC62f8E9BF2b44ce704D2cdCd4aa8021d5A6f4B'
-    },
-    Authenticators: {
-      EthSig: '0x3e3a68e0e70dbf78051109a9f379b7a7adec82f4',
-      EthTx: '0xddb36b865a1021524b936fb29fcba5fac073db74'
-    },
-    Strategies: {
-      Vanilla: '0x3e3A68e0e70dBF78051109a9f379B7A7adec82f4',
-      Comp: '0x343Baf4b44F7f79b14301CFA8068E3F8BE7470De',
-      OZVotes: '0x4aAa33b4367dc5657854bD40738201651eC0cC7B',
-      Whitelist: '0x54449c058bBf0B777745944ea1A7b79786FBC958'
-    },
-    ProposalValidations: {
-      VotingPower: '0x6D9d6D08EF6b26348Bd18F1FC8D953696b7cf311'
-    },
-    ExecutionStrategies: {
-      SimpleQuorumAvatar: '0x177F163F8f789F0d9C5c7993728ADB106a7b12d4',
-      SimpleQuorumTimelock: '0xdb86512e7E3a2d0B93b74b8FE3fFE8AD780791BE',
-      Axiom: null,
-      Isokratia: null
-    }
-  }
+  arb1: createStandardConfig(42161)
 } as const;
 
 export const evmMainnet = createEvmConfig('eth');
@@ -140,4 +114,3 @@ export const evmSepolia = createEvmConfig('sep');
 export const evmOptimism = createEvmConfig('oeth');
 export const evmPolygon = createEvmConfig('matic');
 export const evmArbitrum = createEvmConfig('arb1');
-export const evmLineaGoerli = createEvmConfig('linea-testnet');

From 4d7970d9e744e285f5470bed471d7671746230b6 Mon Sep 17 00:00:00 2001
From: Less <bonustrack@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:04:32 +0700
Subject: [PATCH 05/59] chore: remove Intercom widget (#945)

* chore: remove Intercom widget

* fix: remove lock changes

* chore: remove cookie related policy
---
 apps/ui/src/App.vue                        |  3 +-
 apps/ui/src/components/Messenger.vue       | 13 +++++++
 apps/ui/src/components/Site/Footer.vue     |  5 +--
 apps/ui/src/helpers/constants.ts           |  2 ++
 apps/ui/src/helpers/intercom.ts            | 41 ----------------------
 apps/ui/src/networks/evm/constants.ts      |  8 ++---
 apps/ui/src/networks/starknet/constants.ts | 10 +++---
 apps/ui/src/style.scss                     |  7 ----
 apps/ui/src/views/Policy.vue               |  3 --
 apps/ui/src/views/Proposal.vue             |  3 +-
 apps/ui/src/views/Terms.vue                |  2 +-
 11 files changed, 31 insertions(+), 66 deletions(-)
 create mode 100644 apps/ui/src/components/Messenger.vue
 delete mode 100644 apps/ui/src/helpers/intercom.ts

diff --git a/apps/ui/src/App.vue b/apps/ui/src/App.vue
index c78d636fe..d2a7b3914 100644
--- a/apps/ui/src/App.vue
+++ b/apps/ui/src/App.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import defaultRoutes from '@/routes/default';
 import whiteLabelRoutes from '@/routes/whiteLabel';
-import { startIntercom } from './helpers/intercom';
 
 const route = useRoute();
 const router = useRouter();
@@ -31,7 +30,6 @@ watch(
   resolved => {
     if (!resolved) return;
 
-    if (!isWhiteLabel.value) startIntercom();
     if (isCustomDomain.value && !whiteLabelFailed.value) {
       mountCustomDomainRoutes();
     }
@@ -48,4 +46,5 @@ onMounted(() => {
   <LayoutSplashScreen v-if="!whiteLabelResolved" />
   <LayoutSite v-else-if="routeName === 'site'" />
   <LayoutApp v-else />
+  <Messenger />
 </template>
diff --git a/apps/ui/src/components/Messenger.vue b/apps/ui/src/components/Messenger.vue
new file mode 100644
index 000000000..0008381e8
--- /dev/null
+++ b/apps/ui/src/components/Messenger.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import { HELPDESK_URL } from '@/helpers/constants';
+</script>
+
+<template>
+  <a
+    :href="HELPDESK_URL"
+    target="_blank"
+    class="hidden md:block fixed bottom-4 right-4 rounded-full bg-skin-link text-skin-bg p-2"
+  >
+    <IS-chat class="inline-block size-[32px]" />
+  </a>
+</template>
diff --git a/apps/ui/src/components/Site/Footer.vue b/apps/ui/src/components/Site/Footer.vue
index fb01c3847..72b81ae0a 100644
--- a/apps/ui/src/components/Site/Footer.vue
+++ b/apps/ui/src/components/Site/Footer.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { HELPDESK_URL } from '@/helpers/constants';
 import { repository, version } from '@/../package.json';
 import ICDiscord from '~icons/c/discord';
 import ICGithub from '~icons/c/github';
@@ -50,7 +51,7 @@ const SOCIALS = [
           <div class="eyebrow">Resources</div>
           <div class="space-y-1">
             <div>
-              <a href="https://help.snapshot.box" target="_blank">
+              <a :href="HELPDESK_URL" target="_blank">
                 Helpdesk <IH-arrow-sm-right class="inline-block -rotate-45" />
               </a>
             </div>
@@ -106,7 +107,7 @@ const SOCIALS = [
             <AppLink :to="{ name: 'site-policy' }">Privacy policy</AppLink>
           </div>
           <div>
-            <a class="intercom-launcher" target="_blank"> Contact us </a>
+            <a :href="HELPDESK_URL" target="_blank">Contact us</a>
           </div>
         </div>
       </div>
diff --git a/apps/ui/src/helpers/constants.ts b/apps/ui/src/helpers/constants.ts
index 7b0b9c730..6001a0974 100644
--- a/apps/ui/src/helpers/constants.ts
+++ b/apps/ui/src/helpers/constants.ts
@@ -4,6 +4,8 @@ export const APP_NAME = 'Snapshot';
 
 export const SIDEKICK_URL = 'https://sh5.co';
 
+export const HELPDESK_URL = 'https://help.snapshot.box';
+
 export const ETH_CONTRACT = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
 
 export const CHAIN_IDS: Record<Exclude<NetworkID, 's' | 's-tn'>, ChainId> = {
diff --git a/apps/ui/src/helpers/intercom.ts b/apps/ui/src/helpers/intercom.ts
deleted file mode 100644
index 9350863fc..000000000
--- a/apps/ui/src/helpers/intercom.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-const APP_ID = import.meta.env.VITE_INTERCOM_APP_ID;
-
-export function startIntercom() {
-  if (!APP_ID) return;
-
-  const w: any = window;
-  w.intercomSettings = {
-    app_id: APP_ID,
-    custom_launcher_selector: '.intercom-launcher'
-  };
-  const ic = w.Intercom;
-  if (typeof ic === 'function') {
-    ic('reattach_activator');
-    ic('update', w.intercomSettings);
-  } else {
-    const d = document;
-    const i = function (...args: any[]) {
-      i.c(args);
-    };
-    i.q = [];
-    i.c = function (args: any[]) {
-      i.q.push(args);
-    };
-    w.Intercom = i;
-    const l = function () {
-      const s = d.createElement('script');
-      s.type = 'text/javascript';
-      s.async = true;
-      s.src = `https://widget.intercom.io/widget/${APP_ID}`;
-      const x: any = d.getElementsByTagName('script')[0];
-      x.parentNode.insertBefore(s, x);
-    };
-    if (document.readyState === 'complete') {
-      l();
-    } else if (w.attachEvent) {
-      w.attachEvent('onload', l);
-    } else {
-      w.addEventListener('load', l, false);
-    }
-  }
-}
diff --git a/apps/ui/src/networks/evm/constants.ts b/apps/ui/src/networks/evm/constants.ts
index 8540ee102..583d7500b 100644
--- a/apps/ui/src/networks/evm/constants.ts
+++ b/apps/ui/src/networks/evm/constants.ts
@@ -2,7 +2,7 @@ import { AbiCoder } from '@ethersproject/abi';
 import { Web3Provider } from '@ethersproject/providers';
 import { StandardMerkleTree } from '@openzeppelin/merkle-tree';
 import { clients, evmNetworks } from '@snapshot-labs/sx';
-import { MAX_SYMBOL_LENGTH } from '@/helpers/constants';
+import { HELPDESK_URL, MAX_SYMBOL_LENGTH } from '@/helpers/constants';
 import { pinGraph } from '@/helpers/pin';
 import { getUrl, shorten } from '@/helpers/utils';
 import { NetworkID, StrategyParsedMetadata, VoteType } from '@/types';
@@ -167,7 +167,7 @@ export function createConstants(networkId: NetworkID) {
       name: 'Vanilla',
       about:
         'A strategy that gives one voting power to anyone. It should only be used for testing purposes and not in production.',
-      link: 'https://help.snapshot.box/en/articles/9839150-vanilla-voting-strategy',
+      link: `${HELPDESK_URL}/en/articles/9839150-vanilla-voting-strategy`,
       icon: IHBeaker,
       generateMetadata: async (params: Record<string, any>) => ({
         name: 'Vanilla',
@@ -207,7 +207,7 @@ export function createConstants(networkId: NetworkID) {
       name: 'Whitelist',
       about:
         'A strategy that defines a list of addresses each with designated voting power, using a Merkle tree for verification.',
-      link: 'https://help.snapshot.box/en/articles/9839118-whitelist-voting-strategy',
+      link: `${HELPDESK_URL}/en/articles/9839118-whitelist-voting-strategy`,
       generateSummary: (params: Record<string, any>) => {
         const length =
           params.whitelist.trim().length === 0
@@ -308,7 +308,7 @@ export function createConstants(networkId: NetworkID) {
       name: 'ERC-20 Votes (EIP-5805)',
       about:
         'A strategy that allows delegated balances of OpenZeppelin style checkpoint tokens to be used as voting power.',
-      link: 'https://help.snapshot.box/en/articles/9839125-erc-20-votes-eip-5805-voting-strategy',
+      link: `${HELPDESK_URL}/en/articles/9839125-erc-20-votes-eip-5805-voting-strategy`,
       icon: IHCode,
       generateSummary: (params: Record<string, any>) =>
         `(${shorten(params.contractAddress)}, ${params.decimals})`,
diff --git a/apps/ui/src/networks/starknet/constants.ts b/apps/ui/src/networks/starknet/constants.ts
index b8776809c..89a32e310 100644
--- a/apps/ui/src/networks/starknet/constants.ts
+++ b/apps/ui/src/networks/starknet/constants.ts
@@ -1,7 +1,7 @@
 import { Web3Provider } from '@ethersproject/providers';
 import { clients, starknetNetworks, utils } from '@snapshot-labs/sx';
 import { CallData, uint256 } from 'starknet';
-import { MAX_SYMBOL_LENGTH } from '@/helpers/constants';
+import { HELPDESK_URL, MAX_SYMBOL_LENGTH } from '@/helpers/constants';
 import { pinPineapple } from '@/helpers/pin';
 import { getUrl, shorten, verifyNetwork } from '@/helpers/utils';
 import { NetworkID, StrategyParsedMetadata, VoteType } from '@/types';
@@ -267,7 +267,7 @@ export function createConstants(
       name: 'Whitelist',
       about:
         'A strategy that defines a list of addresses each with designated voting power, using a Merkle tree for verification.',
-      link: 'https://help.snapshot.box/en/articles/9839118-whitelist-voting-strategy',
+      link: `${HELPDESK_URL}/en/articles/9839118-whitelist-voting-strategy`,
       generateSummary: (params: Record<string, any>) => {
         const length =
           params.whitelist.trim().length === 0
@@ -375,7 +375,7 @@ export function createConstants(
       name: 'ERC-20 Votes (EIP-5805)',
       about:
         'A strategy that allows delegated balances of OpenZeppelin style checkpoint tokens to be used as voting power.',
-      link: 'https://help.snapshot.box/en/articles/9839125-erc-20-votes-eip-5805-voting-strategy',
+      link: `${HELPDESK_URL}/en/articles/9839125-erc-20-votes-eip-5805-voting-strategy`,
       icon: IHCode,
       generateSummary: (params: Record<string, any>) =>
         `(${shorten(params.contractAddress)}, ${params.decimals})`,
@@ -432,7 +432,7 @@ export function createConstants(
             config.Strategies.EVMSlotValue,
             'EVM slot value',
             'A strategy that allows to use the value of an slot on EVM chain (for example ERC-20 balance on L1) as voting power.',
-            'https://help.snapshot.box/en/articles/9839132-evm-slot-value-voting-strategy'
+            `${HELPDESK_URL}/en/articles/9839132-evm-slot-value-voting-strategy`
           )
         ]
       : []),
@@ -442,7 +442,7 @@ export function createConstants(
             config.Strategies.OZVotesStorageProof,
             'OZ Votes storage proof (trace 224)',
             'A strategy that allows to use the value of an slot on EVM chain (for example ERC-20 balance on L1) as voting power including delegated balances (trace 224 format).',
-            'https://help.snapshot.box/en/articles/9839152-oz-votes-storage-proof-voting-strategy'
+            `${HELPDESK_URL}/en/articles/9839152-oz-votes-storage-proof-voting-strategy`
           )
         ]
       : []),
diff --git a/apps/ui/src/style.scss b/apps/ui/src/style.scss
index 32fa2d46f..82193eadc 100644
--- a/apps/ui/src/style.scss
+++ b/apps/ui/src/style.scss
@@ -409,13 +409,6 @@ input:placeholder-shown {
   }
 }
 
-// Intercom
-// Hide the launcher button on small screen
-
-div.intercom-launcher {
-  @apply hidden md:block
-}
-
 // tippy.js
 // Fix for long text in tippy.js
 div[data-tippy-root] {
diff --git a/apps/ui/src/views/Policy.vue b/apps/ui/src/views/Policy.vue
index 43ef0f56a..e9f1052ad 100644
--- a/apps/ui/src/views/Policy.vue
+++ b/apps/ui/src/views/Policy.vue
@@ -31,9 +31,6 @@ For further information on the purpose and scope of the data processing of Twitt
 ## Newsletters
 If you subscribe to our newsletter, we process the information provided by you (e.g. contact details) in order to provide you with our newsletter. You may cancel your subscription at any time by using the option to unsubscribe contained in the newsletter or by sending us an email to the address mentioned above.
 
-## Cookies
-We use cookies to operate and optimise our website (see also “Tracking Tools” below). These are text files that are stored on your computer and enable the analysis of the use of our website. You can configure your browser in such a way that no cookies are stored on your computer or a message always appears before a cookie is installed. For further information or to change your cookies settings, please check out our Cookie Consent Management Tool. Complete deactivation of cookies may result in our website not functioning or not functioning completely.
-
 ## Links to third-party offerings
 Our website may contain third-party offerings. Please note that when you use such link, your data such as IP address, personal browser settings etc., are transmitted to these third parties. We have no control over, do not review and cannot be responsible for these third-party websites or their content. Please be aware that the terms of this Privacy Notice do not apply to these third-party websites or their content, or any collection of your data after you click on links to such third-party websites. We encourage you to read the privacy policies of every website you visit. Any links to third-party websites or locations are for your convenience and do not signify our endorsement of such third parties or their products, content, or websites.
 
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
index a998f2cc7..115e411fa 100644
--- a/apps/ui/src/views/Proposal.vue
+++ b/apps/ui/src/views/Proposal.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { HELPDESK_URL } from '@/helpers/constants';
 import { loadSingleTopic, Topic } from '@/helpers/discourse';
 import { getFormattedVotingPower, sanitizeUrl } from '@/helpers/utils';
 import { Choice, Space } from '@/types';
@@ -264,7 +265,7 @@ watchEffect(() => {
                       votingPower?.status === 'success' &&
                       votingPower.totalVotingPower === BigInt(0)
                     "
-                    href="https://help.snapshot.box/en/articles/9566904-why-do-i-have-0-voting-power"
+                    :href="`${HELPDESK_URL}/en/articles/9566904-why-do-i-have-0-voting-power`"
                     target="_blank"
                   >
                     <IH-question-mark-circle />
diff --git a/apps/ui/src/views/Terms.vue b/apps/ui/src/views/Terms.vue
index 27edc449d..ecce46b3f 100644
--- a/apps/ui/src/views/Terms.vue
+++ b/apps/ui/src/views/Terms.vue
@@ -255,7 +255,7 @@ You agree to promptly notify the Foundation of any Claims and cooperate with the
 
 ## 15. Privacy notice and cookie declaration
 
-Please refer to our Privacy Notice to understand how we collect and use and disclose your personal data as well as our Cookie Declaration to understand how we use cookies and how you can change your consent to their use.
+Please refer to our Privacy Notice to understand how we collect and use and disclose your personal data.
 
 ## 16. Miscellaneous
 

From b935c0026abbc504b37c1f68d8a0b6ed9f37a95f Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Mon, 28 Oct 2024 14:29:11 +0400
Subject: [PATCH 06/59] fix: update and fix wrong text in privacy modal (#947)

---
 apps/ui/src/components/Modal/SelectPrivacy.vue | 2 +-
 apps/ui/src/helpers/constants.ts               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/components/Modal/SelectPrivacy.vue b/apps/ui/src/components/Modal/SelectPrivacy.vue
index 33bdee7d3..7b96bbaef 100644
--- a/apps/ui/src/components/Modal/SelectPrivacy.vue
+++ b/apps/ui/src/components/Modal/SelectPrivacy.vue
@@ -24,7 +24,7 @@ function handleSelect(type: Privacy) {
 <template>
   <UiModal :open="open" @close="$emit('close')">
     <template #header>
-      <h3>Select voting system</h3>
+      <h3>Select privacy</h3>
     </template>
     <div class="p-4 flex flex-col gap-2.5">
       <UiSelector
diff --git a/apps/ui/src/helpers/constants.ts b/apps/ui/src/helpers/constants.ts
index 6001a0974..14fb5d4ef 100644
--- a/apps/ui/src/helpers/constants.ts
+++ b/apps/ui/src/helpers/constants.ts
@@ -92,7 +92,7 @@ export const PRIVACY_TYPES_INFO: Record<
     label: 'No privacy'
   },
   shutter: {
-    label: 'Shutter',
+    label: 'Shielded voting',
     description:
       'Choices are encrypted and only visible once the voting period is over.'
   }

From a161715897df716e162a077ab1f88a621efa4319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 28 Oct 2024 11:31:24 +0100
Subject: [PATCH 07/59] feat: EthRelayer execution fixes (#937)

* fix: show message if max. end has not been reached

EthRelayer requires proposal max end to be reached.
https://github.com/snapshot-labs/sx-starknet/blob/af131eb27748671dae5700f6c13c08d622e58383/starknet/src/execution_strategies/eth_relayer.cairo#L35-L41

* fix: always format l1destination address
---
 apps/api/src/utils.ts                          | 4 ++--
 apps/ui/src/composables/useExecutionActions.ts | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/api/src/utils.ts b/apps/api/src/utils.ts
index 116adea95..dd6d50ae6 100644
--- a/apps/api/src/utils.ts
+++ b/apps/api/src/utils.ts
@@ -168,10 +168,10 @@ export async function handleExecutionStrategy(
       const [l1Destination] = payload;
       if (!l1Destination)
         throw new Error('Invalid payload for EthRelayer execution strategy');
-      destinationAddress = l1Destination;
+      destinationAddress = formatAddress('Ethereum', l1Destination);
 
       const SimpleQuorumExecutionStrategyContract = new EthContract(
-        l1Destination,
+        destinationAddress,
         SimpleQuorumExecutionStrategyAbi,
         ethProvider
       );
diff --git a/apps/ui/src/composables/useExecutionActions.ts b/apps/ui/src/composables/useExecutionActions.ts
index c4b93fca6..46a89a2af 100644
--- a/apps/ui/src/composables/useExecutionActions.ts
+++ b/apps/ui/src/composables/useExecutionActions.ts
@@ -75,6 +75,11 @@ export function useExecutionActions(
   });
 
   async function fetchEthRelayerExecutionDetails() {
+    if (currentTimestamp.value < proposal.max_end * 1000) {
+      message.value =
+        'This execution strategy requires max end time to be reached.';
+    }
+
     if (!proposal.execution_tx) return;
 
     const tx = await network.value.helpers.getTransaction(

From 679051e5ab2c3bfd3c9e741b0e4001de110eafef Mon Sep 17 00:00:00 2001
From: less <fabien@bonustrack.co>
Date: Tue, 29 Oct 2024 17:09:11 +0700
Subject: [PATCH 08/59] chore: change IPFS gateway

---
 apps/ui/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/.env b/apps/ui/.env
index b83660012..50e4c4d1f 100644
--- a/apps/ui/.env
+++ b/apps/ui/.env
@@ -2,7 +2,7 @@ VITE_ENABLED_NETWORKS=
 VITE_METADATA_NETWORK=
 VITE_MANA_URL=https://mana.box
 VITE_HIGHLIGHT_URL=https://testnet.highlight.red
-VITE_IPFS_GATEWAY=snapshot.4everland.link
+VITE_IPFS_GATEWAY=ipfs.snapshot.box
 VITE_INFURA_API_KEY=46a5dd9727bf48d4a132672d3f376146
 VITE_ALCHEMY_API_KEY=ombBQyf580z-jx2EVQgJu4eTjePU-a2z
 VITE_OPENSEA_API_KEY=dad1ec57d9024a1d9cb72e6d82c2d015

From ffcc7229e63498bb2c138b95957daf663d0f1eea Mon Sep 17 00:00:00 2001
From: less <fabien@bonustrack.co>
Date: Wed, 30 Oct 2024 01:52:26 +0700
Subject: [PATCH 09/59] style: reduce left padding markdown list items

---
 apps/ui/src/components/Ui/Markdown.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/components/Ui/Markdown.vue b/apps/ui/src/components/Ui/Markdown.vue
index d5254e09d..011f1bb76 100644
--- a/apps/ui/src/components/Ui/Markdown.vue
+++ b/apps/ui/src/components/Ui/Markdown.vue
@@ -227,7 +227,7 @@ html.dark {
 
   ul,
   ol {
-    padding-left: 2em;
+    padding-left: 1em;
     padding-bottom: 8px;
   }
 

From f9082ca559b73769a2a69d9f7a7901d990beaa23 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Thu, 31 Oct 2024 07:10:20 +0530
Subject: [PATCH 10/59] fix: home page - show loading when followed spaces are
 still loading (#953)

---
 apps/ui/src/views/My/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/views/My/Home.vue b/apps/ui/src/views/My/Home.vue
index b873cc0ec..eb188a4fb 100644
--- a/apps/ui/src/views/My/Home.vue
+++ b/apps/ui/src/views/My/Home.vue
@@ -163,7 +163,7 @@ onUnmounted(() => {
   <ProposalsList
     title="Proposals"
     limit="off"
-    :loading="!loaded"
+    :loading="!followedSpacesStore.followedSpacesLoaded || !loaded"
     :loading-more="loadingMore"
     :proposals="proposals"
     show-space

From 0f767b8c69d6986d06c70eb4a1ed7cb33e235b5a Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Thu, 31 Oct 2024 18:25:39 +0530
Subject: [PATCH 11/59] fix: Add with-delegation strategies (#956)

* fix: Add with-delegation strategies

* fix: Add with-delegation strategies
---
 apps/ui/src/networks/offchain/api/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index 8e81877d2..b48f0d8dc 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -70,7 +70,9 @@ const DELEGATION_STRATEGIES = [
   'delegation',
   'erc20-balance-of-delegation',
   'delegation-with-cap',
-  'delegation-with-overrides'
+  'delegation-with-overrides',
+  'with-delegation',
+  'erc20-balance-of-with-delegation'
 ];
 
 const DELEGATE_REGISTRY_URL = 'https://delegate-registry-api.snapshot.box';

From 921ecfe8be58cff42e58accf26a20344a084d677 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Thu, 31 Oct 2024 23:37:16 +0530
Subject: [PATCH 12/59] fix: Add minimum value for proposal threshold (#955)

---
 apps/ui/src/networks/evm/constants.ts      | 1 +
 apps/ui/src/networks/starknet/constants.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/ui/src/networks/evm/constants.ts b/apps/ui/src/networks/evm/constants.ts
index 583d7500b..146096af1 100644
--- a/apps/ui/src/networks/evm/constants.ts
+++ b/apps/ui/src/networks/evm/constants.ts
@@ -154,6 +154,7 @@ export function createConstants(networkId: NetworkID) {
           threshold: {
             type: 'integer',
             title: 'Proposal threshold',
+            minimum: 1,
             examples: ['1']
           }
         }
diff --git a/apps/ui/src/networks/starknet/constants.ts b/apps/ui/src/networks/starknet/constants.ts
index 89a32e310..94c778a44 100644
--- a/apps/ui/src/networks/starknet/constants.ts
+++ b/apps/ui/src/networks/starknet/constants.ts
@@ -253,6 +253,7 @@ export function createConstants(
           threshold: {
             type: 'integer',
             title: 'Proposal threshold',
+            minimum: 1,
             examples: ['1']
           }
         }

From 23d407ad21d1f7089cb1f1cf6f2e608f1be7d43f Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 3 Nov 2024 19:47:36 +0800
Subject: [PATCH 13/59] feat: filters proposals by label (#910)

* fix: allow voting power indicator to shrink

* feat: add labels filter to proposals

* fix: improve filters UI

* feat: persist proposals filters in query param

* fix: allow voting power indicator to shrink

* feat: link proposal label to filtered proposals page

* fix: proposal list should react to url change

* fix: proposals list should refresh on url labels changer

* fix: standardize spacing in editor sidebar

* refactor: refactor proposals labels component

* feat: persist state filter in url

* fix: reduce label height to keep same line height as proposal title

* fix: use line height to control label height

* revert: revert changes

* fix: decrease spacing

* fix: remove duplicate watcher

* fix: improve responsive layout

* fix: ignore invalid label id from query param

* fix: enable outline on labels filter button

* fix: fix left margin on combobox

* perf: improve labels validation

* fix: prevent event bubbling

* fix: fix combobox min width on small screen

* fix: use lower z-index

* fix(ui): improve gradient

* fix(ui): keep same max width

* test: set a min width to labels filter button

* fix: improve gradient

* fix: close labels picker on filters clear

* fix: improve title

* fix: use more simple query string format

* fix: remove selected labels counter

* perf: throttle filter watcher

* refactor: add types

---------

Co-authored-by: Chaitanya <yourchaitu@gmail.com>
---
 apps/ui/src/components/EditorLabels.vue |   6 +-
 apps/ui/src/components/PickerLabel.vue  |  17 ++--
 apps/ui/src/stores/proposals.ts         |   5 +-
 apps/ui/src/views/Space/Proposals.vue   | 104 +++++++++++++++++++++---
 4 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/apps/ui/src/components/EditorLabels.vue b/apps/ui/src/components/EditorLabels.vue
index ef3ff4934..1f1a684d7 100644
--- a/apps/ui/src/components/EditorLabels.vue
+++ b/apps/ui/src/components/EditorLabels.vue
@@ -12,7 +12,11 @@ const labels = defineModel<string[]>({
 
 <template>
   <div v-if="space.labels?.length">
-    <PickerLabel v-model="labels" :labels="space.labels">
+    <PickerLabel
+      v-model="labels"
+      :labels="space.labels"
+      :button-props="{ class: 'outline-none focus-within:text-skin-link' }"
+    >
       <template #button>
         <div class="flex justify-between items-center mb-2.5">
           <h4 class="eyebrow" v-text="'Labels'" />
diff --git a/apps/ui/src/components/PickerLabel.vue b/apps/ui/src/components/PickerLabel.vue
index 71ae7d88d..be6954530 100644
--- a/apps/ui/src/components/PickerLabel.vue
+++ b/apps/ui/src/components/PickerLabel.vue
@@ -12,6 +12,12 @@ import { SpaceMetadataLabel } from '@/types';
 
 const props = defineProps<{
   labels: SpaceMetadataLabel[];
+  buttonProps?: Record<string, any>;
+  panelProps?: Record<string, any>;
+}>();
+
+defineSlots<{
+  button(props: { close: () => void }): any;
 }>();
 
 const selectedLabels = defineModel<string[]>({
@@ -32,16 +38,16 @@ const filteredLabels = computed(() =>
 </script>
 
 <template>
-  <Popover v-slot="{ open }" class="relative contents">
+  <Popover v-slot="{ open, close }" class="relative contents">
     <PopoverButton
-      class="outline-none focus-within:text-skin-link w-full"
+      class="w-full"
       :class="open ? 'text-skin-link' : 'text-skin-text'"
+      v-bind="buttonProps"
     >
-      <slot name="button">
+      <slot name="button" :close="close">
         <IH-pencil />
       </slot>
     </PopoverButton>
-
     <transition
       enter-active-class="transition duration-200 ease-out"
       enter-from-class="translate-y-1 opacity-0"
@@ -52,8 +58,9 @@ const filteredLabels = computed(() =>
     >
       <PopoverPanel
         focus
-        class="absolute z-10 left-0 -mt-2 mx-4 pb-3"
+        class="absolute z-[11] left-0 -mt-2 mx-4 pb-3"
         style="width: calc(100% - 48px)"
+        v-bind="panelProps"
       >
         <Combobox
           v-slot="{ activeOption }"
diff --git a/apps/ui/src/stores/proposals.ts b/apps/ui/src/stores/proposals.ts
index 602f2ba2d..9eb5672cf 100644
--- a/apps/ui/src/stores/proposals.ts
+++ b/apps/ui/src/stores/proposals.ts
@@ -64,7 +64,8 @@ export const useProposalsStore = defineStore('proposals', () => {
   async function fetch(
     spaceId: string,
     networkId: NetworkID,
-    state?: ProposalsFilter['state']
+    state?: ProposalsFilter['state'],
+    labels?: string[]
   ) {
     await metaStore.fetchBlock(networkId);
 
@@ -96,7 +97,7 @@ export const useProposalsStore = defineStore('proposals', () => {
           limit: PROPOSALS_LIMIT
         },
         metaStore.getCurrent(networkId) || 0,
-        { state }
+        { state, labels_in: labels }
       )
     );
 
diff --git a/apps/ui/src/views/Space/Proposals.vue b/apps/ui/src/views/Space/Proposals.vue
index 96c01da5a..a8f6448c1 100644
--- a/apps/ui/src/views/Space/Proposals.vue
+++ b/apps/ui/src/views/Space/Proposals.vue
@@ -18,6 +18,7 @@ const route = useRoute();
 const proposalsStore = useProposalsStore();
 
 const state = ref<NonNullable<ProposalsFilter['state']>>('any');
+const labels = ref<string[]>([]);
 
 const selectIconBaseProps = {
   size: 16
@@ -27,6 +28,17 @@ const proposalsRecord = computed(
   () => proposalsStore.proposals[`${props.space.network}:${props.space.id}`]
 );
 
+const spaceLabels = computed(() => {
+  if (!props.space.labels) return {};
+
+  return Object.fromEntries(props.space.labels.map(label => [label.id, label]));
+});
+
+function handleClearLabelsFilter(close: () => void) {
+  labels.value = [];
+  close();
+}
+
 async function handleEndReached() {
   if (!proposalsRecord.value?.hasMoreProposals) return;
 
@@ -37,25 +49,44 @@ function handleFetchVotingPower() {
   fetchVotingPower(props.space);
 }
 
-watch(
-  [() => route.query.state as string],
-  ([toState]) => {
+watchThrottled(
+  [
+    () => route.query.state as string,
+    () => route.query.labels as string[] | string
+  ],
+  ([toState, toLabels]) => {
     state.value = ['any', 'active', 'pending', 'closed'].includes(toState)
       ? (toState as NonNullable<ProposalsFilter['state']>)
       : 'any';
+    let normalizedLabels = toLabels || [];
+    normalizedLabels = Array.isArray(normalizedLabels)
+      ? normalizedLabels
+      : [normalizedLabels];
+    labels.value = normalizedLabels.filter(id => spaceLabels.value[id]);
+
     proposalsStore.reset(props.space.id, props.space.network);
-    proposalsStore.fetch(props.space.id, props.space.network, state.value);
+    proposalsStore.fetch(
+      props.space.id,
+      props.space.network,
+      state.value,
+      labels.value
+    );
   },
-  { immediate: true }
+  { throttle: 1000, immediate: true }
 );
 
 watch(
-  [props.space, state],
-  ([toSpace, toState], [fromSpace, fromState]) => {
-    if (toSpace.id !== fromSpace?.id || toState !== fromState) {
+  [props.space, state, labels],
+  ([toSpace, toState, toLabels], [fromSpace, fromState, fromLabels]) => {
+    if (
+      toSpace.id !== fromSpace?.id ||
+      toState !== fromState ||
+      toLabels !== fromLabels
+    ) {
       const query: LocationQueryRaw = {
         ...route.query,
-        state: toState === 'any' ? undefined : toState
+        state: toState === 'any' ? undefined : toState,
+        labels: !toLabels?.length ? undefined : toLabels
       };
 
       router.push({ query });
@@ -83,7 +114,10 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
 
 <template>
   <div>
-    <div class="flex justify-between p-4 gap-2">
+    <div
+      class="flex justify-between p-4 gap-2 gap-y-3 flex-row"
+      :class="{ 'flex-col-reverse sm:flex-row': space.labels?.length }"
+    >
       <div class="flex gap-2">
         <UiSelectDropdown
           v-model="state"
@@ -115,6 +149,56 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
             }
           ]"
         />
+        <div v-if="space.labels?.length" class="sm:relative">
+          <PickerLabel
+            v-model="labels"
+            :labels="space.labels"
+            :button-props="{
+              class: [
+                'flex items-center gap-2 relative rounded-full leading-[100%] min-w-[75px] max-w-[230px] border button h-[42px] top-1 text-skin-link bg-skin-bg'
+              ]
+            }"
+            :panel-props="{ class: 'sm:min-w-[290px] sm:ml-0 !mt-3' }"
+          >
+            <template #button="{ close }">
+              <div
+                class="absolute top-[-10px] bg-skin-bg px-1 left-2.5 text-sm text-skin-text"
+              >
+                Labels
+              </div>
+              <div
+                v-if="labels.length"
+                class="flex gap-1 mx-2.5 overflow-hidden items-center"
+              >
+                <ul v-if="labels.length" class="flex gap-1 mr-4">
+                  <li v-for="id in labels" :key="id">
+                    <UiProposalLabel
+                      :label="spaceLabels[id].name"
+                      :color="spaceLabels[id].color"
+                    />
+                  </li>
+                </ul>
+                <div
+                  class="flex items-center absolute rounded-r-full right-[1px] pr-2 h-[23px] bg-skin-bg"
+                >
+                  <div
+                    class="block w-2 -ml-2 h-full bg-gradient-to-l from-skin-bg"
+                  />
+                  <button
+                    v-if="labels.length"
+                    class="text-skin-text rounded-full hover:text-skin-link"
+                    title="Clear all labels"
+                    @click.stop="handleClearLabelsFilter(close)"
+                    @keydown.enter.stop="handleClearLabelsFilter(close)"
+                  >
+                    <IH-x-circle size="16" />
+                  </button>
+                </div>
+              </div>
+              <span v-else class="px-3 text-skin-link">Any</span>
+            </template>
+          </PickerLabel>
+        </div>
       </div>
       <div class="flex gap-2 truncate">
         <IndicatorVotingPower

From fe5d64d546f2d715c7074a0c71e5a57ff932ffa8 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 3 Nov 2024 23:19:32 +0800
Subject: [PATCH 14/59] refactor: remove networks.json file (#944)

* fix: remove linea network

* refactor: remove networks.json
---
 apps/ui/src/composables/useWeb3.ts     |  6 +--
 apps/ui/src/helpers/call.ts            |  2 +-
 apps/ui/src/helpers/networks.json      | 56 --------------------------
 apps/ui/src/networks/evm/index.ts      |  4 +-
 apps/ui/src/networks/offchain/index.ts |  6 +--
 5 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 apps/ui/src/helpers/networks.json

diff --git a/apps/ui/src/composables/useWeb3.ts b/apps/ui/src/composables/useWeb3.ts
index 4216c7ced..db042bbc1 100644
--- a/apps/ui/src/composables/useWeb3.ts
+++ b/apps/ui/src/composables/useWeb3.ts
@@ -1,8 +1,8 @@
 import { Web3Provider } from '@ethersproject/providers';
 import { formatUnits } from '@ethersproject/units';
 import { getInstance } from '@snapshot-labs/lock/plugins/vue3';
+import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { constants } from 'starknet';
-import networks from '@/helpers/networks.json';
 import { formatAddress } from '@/helpers/utils';
 import { STARKNET_CONNECTORS } from '@/networks/common/constants';
 import { Connector } from '@/networks/types';
@@ -11,12 +11,12 @@ const STARKNET_NETWORKS = {
   [constants.StarknetChainId.SN_MAIN]: {
     key: constants.StarknetChainId.SN_MAIN,
     chainId: constants.StarknetChainId.SN_MAIN,
-    explorer: 'https://starkscan.co'
+    explorer: { url: 'https://starkscan.co' }
   },
   [constants.StarknetChainId.SN_SEPOLIA]: {
     key: constants.StarknetChainId.SN_SEPOLIA,
     chainId: constants.StarknetChainId.SN_SEPOLIA,
-    explorer: 'https://sepolia.starkscan.co'
+    explorer: { url: 'https://sepolia.starkscan.co' }
   }
 };
 
diff --git a/apps/ui/src/helpers/call.ts b/apps/ui/src/helpers/call.ts
index f8851f4e0..d4cc8141d 100644
--- a/apps/ui/src/helpers/call.ts
+++ b/apps/ui/src/helpers/call.ts
@@ -1,6 +1,6 @@
 import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
-import networks from '@/helpers/networks.json';
+import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 
 export async function call(provider, abi: any[], call: any[], options?) {
   const contract = new Contract(call[0], abi, provider);
diff --git a/apps/ui/src/helpers/networks.json b/apps/ui/src/helpers/networks.json
deleted file mode 100644
index ed66c4203..000000000
--- a/apps/ui/src/helpers/networks.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "1": {
-    "key": "1",
-    "chainId": 1,
-    "multicall": "0xeefba1e63905ef1d7acba5a8513c70307c1ce441",
-    "explorer": "https://etherscan.io"
-  },
-  "10": {
-    "key": "10",
-    "chainId": 10,
-    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
-    "explorer": "https://optimistic.etherscan.io"
-  },
-  "56": {
-    "key": "56",
-    "chainId": 56,
-    "multicall": "0x1Ee38d535d541c55C9dae27B12edf090C608E6Fb",
-    "explorer": "https://bscscan.com"
-  },
-  "100": {
-    "key": "100",
-    "chainId": 100,
-    "multicall": "0xb5b692a88BDFc81ca69dcB1d924f59f0413A602a",
-    "explorer": "https://gnosis.blockscout.com"
-  },
-  "137": {
-    "key": "137",
-    "chainId": 137,
-    "multicall": "0xCBca837161be50EfA5925bB9Cc77406468e76751",
-    "explorer": "https://polygonscan.com"
-  },
-  "250": {
-    "key": "250",
-    "chainId": 250,
-    "multicall": "0x7f6A10218264a22B4309F3896745687E712962a0",
-    "explorer": "https://ftmscan.com"
-  },
-  "8453": {
-    "key": "8453",
-    "chainId": 8453,
-    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
-    "explorer": "https://basescan.org/"
-  },
-  "42161": {
-    "key": "42161",
-    "chainId": 42161,
-    "multicall": "0x7A7443F8c577d537f1d8cD4a629d40a3148Dd7ee",
-    "explorer": "https://arbiscan.io"
-  },
-  "11155111": {
-    "key": "11155111",
-    "chainId": 11155111,
-    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
-    "explorer": "https://sepolia.etherscan.io"
-  }
-}
diff --git a/apps/ui/src/networks/evm/index.ts b/apps/ui/src/networks/evm/index.ts
index 2e704f241..facdd5b0c 100644
--- a/apps/ui/src/networks/evm/index.ts
+++ b/apps/ui/src/networks/evm/index.ts
@@ -1,4 +1,4 @@
-import networks from '@/helpers/networks.json';
+import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { pinGraph } from '@/helpers/pin';
 import { getProvider } from '@/helpers/provider';
 import { Network } from '@/networks/types';
@@ -110,7 +110,7 @@ export function createEvmNetwork(networkId: NetworkID): Network {
       else if (['address', 'contract', 'strategy'].includes(type))
         dataType = 'address';
 
-      return `${networks[chainId].explorer}/${dataType}/${id}`;
+      return `${networks[chainId].explorer.url}/${dataType}/${id}`;
     }
   };
 
diff --git a/apps/ui/src/networks/offchain/index.ts b/apps/ui/src/networks/offchain/index.ts
index 727112371..08e432458 100644
--- a/apps/ui/src/networks/offchain/index.ts
+++ b/apps/ui/src/networks/offchain/index.ts
@@ -1,5 +1,5 @@
+import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { getSpaceController } from '@/helpers/ens';
-import networks from '@/helpers/networks.json';
 import { pinPineapple } from '@/helpers/pin';
 import { getProvider } from '@/helpers/provider';
 import { Network } from '@/networks/types';
@@ -60,7 +60,7 @@ export function createOffchainNetwork(networkId: NetworkID): Network {
       switch (type) {
         case 'transaction':
           if (id.startsWith('0x')) {
-            return `${network.explorer}/tx/${id}`;
+            return network ? `${network.explorer.url}/tx/${id}` : '';
           }
 
           return `https://signator.io/view?ipfs=${id}`;
@@ -68,7 +68,7 @@ export function createOffchainNetwork(networkId: NetworkID): Network {
           return `${SNAPSHOT_URLS[networkId]}/#/strategy/${id}`;
         case 'contract':
         case 'address':
-          return network ? `${network.explorer}/address/${id}` : '';
+          return network ? `${network.explorer.url}/address/${id}` : '';
         default:
           throw new Error('Not implemented');
       }

From e2277d59aef8c4449eec43252dd9497d80d6831c Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:10:11 +0800
Subject: [PATCH 15/59] fix: fix missing account modal on editor page (#965)

---
 apps/ui/src/components/Layout/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui/src/components/Layout/App.vue b/apps/ui/src/components/Layout/App.vue
index 26edae2ac..952f18b93 100644
--- a/apps/ui/src/components/Layout/App.vue
+++ b/apps/ui/src/components/Layout/App.vue
@@ -180,7 +180,7 @@ router.afterEach(() => {
           { '!flex app-sidebar-open': uiStore.sideMenuOpen }
         ]"
       />
-      <AppTopnav v-if="hasTopNav" :has-app-nav="hasAppNav">
+      <AppTopnav :has-app-nav="hasAppNav" :class="{ hidden: !hasTopNav }">
         <template #toggle-sidebar-button>
           <button
             v-if="hasSwipeableContent"

From 590489dc61c8ca56a85702078c38f44db340c629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 4 Nov 2024 09:22:05 +0100
Subject: [PATCH 16/59] docs: add yarn dev:full docks (#958)

* docs: add yarn dev:full docks

* docs: separete UI instructions
---
 README.md | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e3d240255..1acf2190d 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,16 @@ yarn
 
 ### Compiles and hot-reloads for development
 
+#### UI only
+
 ```sh
 yarn dev
-
-# if you want to run full stack (including backend services)
-yarn dev:full
 ```
 
+#### UI with backend services
+
+[See here.](./README.md#running-local-services)
+
 ### Compiles and minifies for production
 
 ```
@@ -50,6 +53,36 @@ yarn test
 yarn typecheck
 ```
 
+## Running local services
+
+You can run all local services (api, subgraph-api, mana, ui) with single command assuming you have all necessary environment variables set up.
+Local APIs will only be used for Ethereum Sepolia and Starknet Sepolia.
+
+```
+yarn dev:full
+```
+
+### Setup
+
+You need to have Docker running on your machine.
+
+In `apps/api` and `apps/mana` copy `.env.example` to `.env` files.
+
+In `apps/mana/.env` you need to fill in following empty variables:
+
+- `STARKNET_MNEMONIC` and `ETH_MNEMONIC` - if you want to use it as relayer.
+- `HERODOTUS_API_KEY` and `HERODOTUS_LEGACY_API_KEY` - if you want to use L1<->L2 messaging (voting with strategies that use L1 proofs)
+
+### Getting it running faster
+
+If you run `yarn dev:full` it will take long time to sync all the blocks for the first time. To mitigate it you can just change starting block
+for indexing here:
+
+- https://github.com/snapshot-labs/sx-monorepo/blob/0f767b8c69d6986d06c70eb4a1ed7cb33e235b5a/apps/api/src/overrrides.ts#L50 (for Starknet)
+- https://github.com/snapshot-labs/sx-monorepo/blob/0f767b8c69d6986d06c70eb4a1ed7cb33e235b5a/apps/subgraph-api/networks.json#L12-L21 (for Ethereum)
+
+If you do that make sure to create a new space, because spaces created before the new starting block you picked won't be available.
+
 ## Versioning packages
 
 Packages are versioned using [`changesets`](https://github.com/changesets/changesets).

From 18e906c3060ea9d2d38613afaf38a83ad50cea48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 4 Nov 2024 11:17:17 +0100
Subject: [PATCH 17/59] refactor: allow any network to be used in delegations
 (#946)

* refactor: allow any network to be used in delegations

* chore: remove unused import

* fix: allow string chainId

* fix: hide testnet network on mainnet (#962)

---------

Co-authored-by: Wan <495709+wa0x6e@users.noreply.github.com>
---
 apps/ui/src/components/Modal/Delegate.vue     | 11 ++++---
 .../src/components/Modal/DelegationConfig.vue | 10 ++----
 .../src/components/Modal/TreasuryConfig.vue   |  3 ++
 apps/ui/src/components/SpaceDelegates.vue     | 15 +--------
 apps/ui/src/components/Ui/SelectorNetwork.vue | 32 +++++++++++++------
 apps/ui/src/composables/useActions.ts         | 19 +++++------
 apps/ui/src/helpers/utils.test.ts             |  5 +--
 apps/ui/src/helpers/utils.ts                  |  3 +-
 apps/ui/src/helpers/validation.ts             |  1 +
 .../src/networks/common/graphqlApi/index.ts   | 23 +++++++++----
 apps/ui/src/networks/evm/actions.ts           |  2 +-
 apps/ui/src/networks/offchain/api/index.ts    |  2 --
 apps/ui/src/networks/starknet/actions.ts      |  4 +--
 apps/ui/src/types.ts                          |  3 +-
 14 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/apps/ui/src/components/Modal/Delegate.vue b/apps/ui/src/components/Modal/Delegate.vue
index 4ceab72bc..994713a89 100644
--- a/apps/ui/src/components/Modal/Delegate.vue
+++ b/apps/ui/src/components/Modal/Delegate.vue
@@ -47,7 +47,11 @@ const sending = ref(false);
 const formErrors = ref({} as Record<string, any>);
 
 async function handleSubmit() {
-  if (!props.delegation.apiType || !props.delegation.contractAddress) {
+  if (
+    !props.delegation.apiType ||
+    !props.delegation.contractAddress ||
+    !props.delegation.chainId
+  ) {
     return;
   }
 
@@ -56,11 +60,10 @@ async function handleSubmit() {
   try {
     await delegate(
       props.space,
-      props.delegation.contractNetwork,
       props.delegation.apiType,
       form.delegatee,
-      `${props.delegation.contractNetwork}:${props.delegation.contractAddress}`,
-      props.delegation.chainId ?? undefined
+      props.delegation.contractAddress,
+      props.delegation.chainId
     );
     emit('close');
   } catch (e) {
diff --git a/apps/ui/src/components/Modal/DelegationConfig.vue b/apps/ui/src/components/Modal/DelegationConfig.vue
index def7ece27..734562826 100644
--- a/apps/ui/src/components/Modal/DelegationConfig.vue
+++ b/apps/ui/src/components/Modal/DelegationConfig.vue
@@ -8,7 +8,6 @@ const DEFAULT_FORM_STATE = {
   name: '',
   apiType: null,
   apiUrl: null,
-  contractNetwork: null,
   contractAddress: null,
   chainId: null
 };
@@ -27,10 +26,6 @@ const showPicker = ref(false);
 const searchValue = ref('');
 const form: Ref<SpaceMetadataDelegation> = ref(clone(DEFAULT_FORM_STATE));
 
-const networkField = computed(() =>
-  offchainNetworks.includes(props.networkId) ? 'chainId' : 'contractNetwork'
-);
-
 const definition = computed(() => {
   return {
     type: 'object',
@@ -69,14 +64,15 @@ const definition = computed(() => {
                 'https://api.thegraph.com/subgraphs/name/arr00/uniswap-governance-v2'
               ]
             },
-            [networkField.value]: {
+            chainId: {
               type: ['string', 'number', 'null'],
               format: 'network',
               networkId: props.networkId,
+              networksListKind: 'full',
               title: 'Delegation contract network',
               nullable: true
             },
-            ...(form.value[networkField.value] !== null
+            ...(form.value.chainId !== null
               ? {
                   contractAddress: {
                     type: 'string',
diff --git a/apps/ui/src/components/Modal/TreasuryConfig.vue b/apps/ui/src/components/Modal/TreasuryConfig.vue
index 52372cbd9..cdc171563 100644
--- a/apps/ui/src/components/Modal/TreasuryConfig.vue
+++ b/apps/ui/src/components/Modal/TreasuryConfig.vue
@@ -47,6 +47,9 @@ const definition = computed(() => {
         type: ['string', 'number', 'null'],
         format: 'network',
         networkId: props.networkId,
+        networksListKind: offchainNetworks.includes(props.networkId)
+          ? 'full'
+          : 'builtin',
         title: 'Treasury network',
         nullable: true
       },
diff --git a/apps/ui/src/components/SpaceDelegates.vue b/apps/ui/src/components/SpaceDelegates.vue
index 6449a7693..b5c5f199e 100644
--- a/apps/ui/src/components/SpaceDelegates.vue
+++ b/apps/ui/src/components/SpaceDelegates.vue
@@ -3,7 +3,6 @@ import { sanitizeUrl } from '@braintree/sanitize-url';
 import removeMarkdown from 'remove-markdown';
 import { getGenericExplorerUrl } from '@/helpers/explorer';
 import { _n, _p, _vp, shorten } from '@/helpers/utils';
-import { getNetwork } from '@/networks';
 import { DelegationType, Space, SpaceMetadataDelegation } from '@/types';
 
 const props = defineProps<{
@@ -40,23 +39,11 @@ const {
 );
 const { web3 } = useWeb3();
 
-const currentNetwork = computed(() => {
-  if (!props.delegation.contractNetwork) return null;
-
-  try {
-    return getNetwork(props.delegation.contractNetwork);
-  } catch (e) {
-    return null;
-  }
-});
-
 const spaceKey = computed(() => `${props.space.network}:${props.space.id}`);
 
 function getExplorerUrl(address: string, type: 'address' | 'token') {
   let url: string | null = null;
-  if (currentNetwork.value) {
-    url = currentNetwork.value.helpers.getExplorerUrl(address, type);
-  } else if (props.delegation.chainId) {
+  if (props.delegation.chainId) {
     url = getGenericExplorerUrl(props.delegation.chainId, address, type);
   } else {
     return null;
diff --git a/apps/ui/src/components/Ui/SelectorNetwork.vue b/apps/ui/src/components/Ui/SelectorNetwork.vue
index 71bb5a7b1..b11fec7fd 100644
--- a/apps/ui/src/components/Ui/SelectorNetwork.vue
+++ b/apps/ui/src/components/Ui/SelectorNetwork.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { getUrl } from '@/helpers/utils';
-import { enabledNetworks, getNetwork, offchainNetworks } from '@/networks';
+import { enabledNetworks, getNetwork } from '@/networks';
 import { METADATA as STARKNET_NETWORK_METADATA } from '@/networks/starknet';
 import { BaseDefinition, NetworkID } from '@/types';
 
@@ -12,11 +12,12 @@ const network = defineModel<string | number | null>({
 const props = defineProps<{
   definition: BaseDefinition<string | number | null> & {
     networkId: NetworkID;
+    networksListKind?: 'full' | 'builtin';
   };
 }>();
 
 const options = computed(() => {
-  if (offchainNetworks.includes(props.definition.networkId)) {
+  if (props.definition.networksListKind === 'full') {
     const baseNetworks = Object.entries(networks)
       .filter(([, network]) => {
         if (
@@ -41,15 +42,26 @@ const options = computed(() => {
 
     return [
       ...baseNetworks,
-      ...Object.values(STARKNET_NETWORK_METADATA).map(metadata => ({
-        id: metadata.chainId,
-        name: metadata.name,
-        icon: h('img', {
-          src: getUrl(metadata.avatar),
-          alt: metadata.name,
-          class: 'rounded-full'
+      ...Object.values(STARKNET_NETWORK_METADATA)
+        .filter(metadata => {
+          if (
+            props.definition.networkId === 's' &&
+            metadata.name.includes('Sepolia')
+          ) {
+            return false;
+          }
+
+          return true;
         })
-      }))
+        .map(metadata => ({
+          id: metadata.chainId,
+          name: metadata.name,
+          icon: h('img', {
+            src: getUrl(metadata.avatar),
+            alt: metadata.name,
+            class: 'rounded-full'
+          })
+        }))
     ];
   }
 
diff --git a/apps/ui/src/composables/useActions.ts b/apps/ui/src/composables/useActions.ts
index 4e6151e57..af744e40d 100644
--- a/apps/ui/src/composables/useActions.ts
+++ b/apps/ui/src/composables/useActions.ts
@@ -574,22 +574,19 @@ export function useActions() {
 
   async function delegate(
     space: Space,
-    networkId: NetworkID | null,
     delegationType: DelegationType,
     delegatee: string,
     delegationContract: string,
-    chainIdOverride?: ChainId
+    chainId: ChainId
   ) {
     if (!web3.value.account) return await forceLogin();
 
-    const isEvmNetwork = typeof chainIdOverride === 'number';
-    const actionNetwork =
-      networkId ??
-      (isEvmNetwork
-        ? 'eth'
-        : (Object.entries(METADATA).find(
-            ([, metadata]) => metadata.chainId === chainIdOverride
-          )?.[0] as NetworkID));
+    const isEvmNetwork = typeof chainId === 'number';
+    const actionNetwork = isEvmNetwork
+      ? 'eth'
+      : (Object.entries(METADATA).find(
+          ([, metadata]) => metadata.chainId === chainId
+        )?.[0] as NetworkID);
     if (!actionNetwork) throw new Error('Failed to detect action network');
 
     const network = getReadWriteNetwork(actionNetwork);
@@ -603,7 +600,7 @@ export function useActions() {
         delegationType,
         delegatee,
         delegationContract,
-        chainIdOverride
+        chainId
       )
     );
   }
diff --git a/apps/ui/src/helpers/utils.test.ts b/apps/ui/src/helpers/utils.test.ts
index 64145a194..94eea47b0 100644
--- a/apps/ui/src/helpers/utils.test.ts
+++ b/apps/ui/src/helpers/utils.test.ts
@@ -86,7 +86,7 @@ describe('utils', () => {
             apiType: 'governor-subgraph',
             apiUrl:
               'https://thegraph.com/hosted-service/subgraph/arr00/uniswap-governance-v2',
-            contractNetwork: 'sep',
+            chainId: 11155111,
             contractAddress: '0x000000000000000000000000000000000000dead'
           }
         ]
@@ -124,7 +124,8 @@ describe('utils', () => {
               api_type: 'governor-subgraph',
               api_url:
                 'https://thegraph.com/hosted-service/subgraph/arr00/uniswap-governance-v2',
-              contract: 'sep:0x000000000000000000000000000000000000dead'
+              contract: '0x000000000000000000000000000000000000dead',
+              chain_id: 11155111
             }
           ]
         }
diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
index 6e7d4f3e2..eab925ff5 100644
--- a/apps/ui/src/helpers/utils.ts
+++ b/apps/ui/src/helpers/utils.ts
@@ -457,7 +457,8 @@ export function createErc1155Metadata(
         name: delegation.name,
         api_type: delegation.apiType,
         api_url: delegation.apiUrl,
-        contract: `${delegation.contractNetwork}:${delegation.contractAddress}`
+        contract: delegation.contractAddress,
+        chain_id: delegation.chainId
       })),
       ...extraProperties
     }
diff --git a/apps/ui/src/helpers/validation.ts b/apps/ui/src/helpers/validation.ts
index 7646c195b..95f8e38d0 100644
--- a/apps/ui/src/helpers/validation.ts
+++ b/apps/ui/src/helpers/validation.ts
@@ -254,6 +254,7 @@ ajv.addFormat('network', {
   validate: () => true
 });
 ajv.addKeyword('networkId');
+ajv.addKeyword('networksListKind');
 
 function getErrorMessage(errorObject: Partial<ErrorObject>): string {
   if (!errorObject.message) return 'Invalid field.';
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index 42bb72afe..c0da8b354 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -199,17 +199,28 @@ function formatSpace(
       return { id, name, description, color };
     }),
     delegations: space.metadata.delegations.map(delegation => {
-      const { name, api_type, api_url, contract } = JSON.parse(delegation);
-
-      const [network, address] = contract.split(':');
+      const { name, api_type, api_url, contract, chain_id } =
+        JSON.parse(delegation);
+
+      if (contract.includes(':')) {
+        // NOTE: Legacy format
+        const [network, address] = contract.split(':');
+
+        return {
+          name: name,
+          apiType: api_type,
+          apiUrl: api_url,
+          contractAddress: address === 'null' ? null : address,
+          chainId: CHAIN_IDS[network]
+        };
+      }
 
       return {
         name: name,
         apiType: api_type,
         apiUrl: api_url,
-        contractNetwork: network === 'null' ? null : network,
-        contractAddress: address === 'null' ? null : address,
-        chainId: CHAIN_IDS[network]
+        contractAddress: contract,
+        chainId: chain_id
       };
     }),
     executors: space.metadata.executors,
diff --git a/apps/ui/src/networks/evm/actions.ts b/apps/ui/src/networks/evm/actions.ts
index 0c92c7be1..837b1394e 100644
--- a/apps/ui/src/networks/evm/actions.ts
+++ b/apps/ui/src/networks/evm/actions.ts
@@ -620,7 +620,7 @@ export function createActions(
 
       if (delegationType === 'governor-subgraph') {
         contractParams = {
-          address: delegationContract.split(':')[1],
+          address: delegationContract,
           functionName: 'delegate',
           functionParams: [delegatee],
           abi: ['function delegate(address delegatee)']
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index b48f0d8dc..55f5f6cb8 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -368,7 +368,6 @@ function formatDelegations(space: ApiSpace): SpaceMetadataDelegation[] {
       name,
       apiType,
       apiUrl: space.delegationPortal.delegationApi,
-      contractNetwork: null,
       contractAddress: space.delegationPortal.delegationContract,
       chainId
     });
@@ -381,7 +380,6 @@ function formatDelegations(space: ApiSpace): SpaceMetadataDelegation[] {
       name: 'Delegate registry',
       apiType: 'delegate-registry',
       apiUrl: DELEGATE_REGISTRY_URL,
-      contractNetwork: null,
       contractAddress: space.id,
       chainId
     });
diff --git a/apps/ui/src/networks/starknet/actions.ts b/apps/ui/src/networks/starknet/actions.ts
index 44c37f708..dd430164d 100644
--- a/apps/ui/src/networks/starknet/actions.ts
+++ b/apps/ui/src/networks/starknet/actions.ts
@@ -688,12 +688,10 @@ export function createActions(
     ) => {
       await verifyStarknetNetwork(web3, chainId);
 
-      const [, contractAddress] = delegationContract.split(':');
-
       const { account }: { account: Account } = web3.provider;
 
       let calls: AllowArray<Call> = {
-        contractAddress,
+        contractAddress: delegationContract,
         entrypoint: 'delegate',
         calldata: CallData.compile({ delegatee })
       };
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index 1058ee10a..72e4eaee0 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -77,9 +77,8 @@ export type SpaceMetadataDelegation = {
   name: string | null;
   apiType: DelegationType | null;
   apiUrl: string | null;
-  contractNetwork: NetworkID | null;
   contractAddress: string | null;
-  chainId?: ChainId | null;
+  chainId: ChainId | null;
 };
 
 export type SpaceMetadata = {

From 7ac254120dfeb18bef83f782a798f828a9079f52 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Mon, 4 Nov 2024 18:15:02 +0530
Subject: [PATCH 18/59] fix: close accont modal on topnav unmount (#966)

---
 apps/ui/src/components/App/Topnav.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/ui/src/components/App/Topnav.vue b/apps/ui/src/components/App/Topnav.vue
index a5032afe3..fc7aa8c26 100644
--- a/apps/ui/src/components/App/Topnav.vue
+++ b/apps/ui/src/components/App/Topnav.vue
@@ -85,6 +85,10 @@ watch(
   searchQuery => (searchValue.value = searchQuery),
   { immediate: true }
 );
+
+onUnmounted(() => {
+  resetAccountModal();
+});
 </script>
 
 <template>

From 0bb1c8463f81d6b1d56d33b46322217758c27f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 4 Nov 2024 15:53:44 +0100
Subject: [PATCH 19/59] Revert "feat: filters proposals by label (#910)" (#967)

This reverts commit 23d407ad21d1f7089cb1f1cf6f2e608f1be7d43f.
---
 apps/ui/src/components/EditorLabels.vue |   6 +-
 apps/ui/src/components/PickerLabel.vue  |  17 ++--
 apps/ui/src/stores/proposals.ts         |   5 +-
 apps/ui/src/views/Space/Proposals.vue   | 104 +++---------------------
 4 files changed, 18 insertions(+), 114 deletions(-)

diff --git a/apps/ui/src/components/EditorLabels.vue b/apps/ui/src/components/EditorLabels.vue
index 1f1a684d7..ef3ff4934 100644
--- a/apps/ui/src/components/EditorLabels.vue
+++ b/apps/ui/src/components/EditorLabels.vue
@@ -12,11 +12,7 @@ const labels = defineModel<string[]>({
 
 <template>
   <div v-if="space.labels?.length">
-    <PickerLabel
-      v-model="labels"
-      :labels="space.labels"
-      :button-props="{ class: 'outline-none focus-within:text-skin-link' }"
-    >
+    <PickerLabel v-model="labels" :labels="space.labels">
       <template #button>
         <div class="flex justify-between items-center mb-2.5">
           <h4 class="eyebrow" v-text="'Labels'" />
diff --git a/apps/ui/src/components/PickerLabel.vue b/apps/ui/src/components/PickerLabel.vue
index be6954530..71ae7d88d 100644
--- a/apps/ui/src/components/PickerLabel.vue
+++ b/apps/ui/src/components/PickerLabel.vue
@@ -12,12 +12,6 @@ import { SpaceMetadataLabel } from '@/types';
 
 const props = defineProps<{
   labels: SpaceMetadataLabel[];
-  buttonProps?: Record<string, any>;
-  panelProps?: Record<string, any>;
-}>();
-
-defineSlots<{
-  button(props: { close: () => void }): any;
 }>();
 
 const selectedLabels = defineModel<string[]>({
@@ -38,16 +32,16 @@ const filteredLabels = computed(() =>
 </script>
 
 <template>
-  <Popover v-slot="{ open, close }" class="relative contents">
+  <Popover v-slot="{ open }" class="relative contents">
     <PopoverButton
-      class="w-full"
+      class="outline-none focus-within:text-skin-link w-full"
       :class="open ? 'text-skin-link' : 'text-skin-text'"
-      v-bind="buttonProps"
     >
-      <slot name="button" :close="close">
+      <slot name="button">
         <IH-pencil />
       </slot>
     </PopoverButton>
+
     <transition
       enter-active-class="transition duration-200 ease-out"
       enter-from-class="translate-y-1 opacity-0"
@@ -58,9 +52,8 @@ const filteredLabels = computed(() =>
     >
       <PopoverPanel
         focus
-        class="absolute z-[11] left-0 -mt-2 mx-4 pb-3"
+        class="absolute z-10 left-0 -mt-2 mx-4 pb-3"
         style="width: calc(100% - 48px)"
-        v-bind="panelProps"
       >
         <Combobox
           v-slot="{ activeOption }"
diff --git a/apps/ui/src/stores/proposals.ts b/apps/ui/src/stores/proposals.ts
index 9eb5672cf..602f2ba2d 100644
--- a/apps/ui/src/stores/proposals.ts
+++ b/apps/ui/src/stores/proposals.ts
@@ -64,8 +64,7 @@ export const useProposalsStore = defineStore('proposals', () => {
   async function fetch(
     spaceId: string,
     networkId: NetworkID,
-    state?: ProposalsFilter['state'],
-    labels?: string[]
+    state?: ProposalsFilter['state']
   ) {
     await metaStore.fetchBlock(networkId);
 
@@ -97,7 +96,7 @@ export const useProposalsStore = defineStore('proposals', () => {
           limit: PROPOSALS_LIMIT
         },
         metaStore.getCurrent(networkId) || 0,
-        { state, labels_in: labels }
+        { state }
       )
     );
 
diff --git a/apps/ui/src/views/Space/Proposals.vue b/apps/ui/src/views/Space/Proposals.vue
index a8f6448c1..96c01da5a 100644
--- a/apps/ui/src/views/Space/Proposals.vue
+++ b/apps/ui/src/views/Space/Proposals.vue
@@ -18,7 +18,6 @@ const route = useRoute();
 const proposalsStore = useProposalsStore();
 
 const state = ref<NonNullable<ProposalsFilter['state']>>('any');
-const labels = ref<string[]>([]);
 
 const selectIconBaseProps = {
   size: 16
@@ -28,17 +27,6 @@ const proposalsRecord = computed(
   () => proposalsStore.proposals[`${props.space.network}:${props.space.id}`]
 );
 
-const spaceLabels = computed(() => {
-  if (!props.space.labels) return {};
-
-  return Object.fromEntries(props.space.labels.map(label => [label.id, label]));
-});
-
-function handleClearLabelsFilter(close: () => void) {
-  labels.value = [];
-  close();
-}
-
 async function handleEndReached() {
   if (!proposalsRecord.value?.hasMoreProposals) return;
 
@@ -49,44 +37,25 @@ function handleFetchVotingPower() {
   fetchVotingPower(props.space);
 }
 
-watchThrottled(
-  [
-    () => route.query.state as string,
-    () => route.query.labels as string[] | string
-  ],
-  ([toState, toLabels]) => {
+watch(
+  [() => route.query.state as string],
+  ([toState]) => {
     state.value = ['any', 'active', 'pending', 'closed'].includes(toState)
       ? (toState as NonNullable<ProposalsFilter['state']>)
       : 'any';
-    let normalizedLabels = toLabels || [];
-    normalizedLabels = Array.isArray(normalizedLabels)
-      ? normalizedLabels
-      : [normalizedLabels];
-    labels.value = normalizedLabels.filter(id => spaceLabels.value[id]);
-
     proposalsStore.reset(props.space.id, props.space.network);
-    proposalsStore.fetch(
-      props.space.id,
-      props.space.network,
-      state.value,
-      labels.value
-    );
+    proposalsStore.fetch(props.space.id, props.space.network, state.value);
   },
-  { throttle: 1000, immediate: true }
+  { immediate: true }
 );
 
 watch(
-  [props.space, state, labels],
-  ([toSpace, toState, toLabels], [fromSpace, fromState, fromLabels]) => {
-    if (
-      toSpace.id !== fromSpace?.id ||
-      toState !== fromState ||
-      toLabels !== fromLabels
-    ) {
+  [props.space, state],
+  ([toSpace, toState], [fromSpace, fromState]) => {
+    if (toSpace.id !== fromSpace?.id || toState !== fromState) {
       const query: LocationQueryRaw = {
         ...route.query,
-        state: toState === 'any' ? undefined : toState,
-        labels: !toLabels?.length ? undefined : toLabels
+        state: toState === 'any' ? undefined : toState
       };
 
       router.push({ query });
@@ -114,10 +83,7 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
 
 <template>
   <div>
-    <div
-      class="flex justify-between p-4 gap-2 gap-y-3 flex-row"
-      :class="{ 'flex-col-reverse sm:flex-row': space.labels?.length }"
-    >
+    <div class="flex justify-between p-4 gap-2">
       <div class="flex gap-2">
         <UiSelectDropdown
           v-model="state"
@@ -149,56 +115,6 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
             }
           ]"
         />
-        <div v-if="space.labels?.length" class="sm:relative">
-          <PickerLabel
-            v-model="labels"
-            :labels="space.labels"
-            :button-props="{
-              class: [
-                'flex items-center gap-2 relative rounded-full leading-[100%] min-w-[75px] max-w-[230px] border button h-[42px] top-1 text-skin-link bg-skin-bg'
-              ]
-            }"
-            :panel-props="{ class: 'sm:min-w-[290px] sm:ml-0 !mt-3' }"
-          >
-            <template #button="{ close }">
-              <div
-                class="absolute top-[-10px] bg-skin-bg px-1 left-2.5 text-sm text-skin-text"
-              >
-                Labels
-              </div>
-              <div
-                v-if="labels.length"
-                class="flex gap-1 mx-2.5 overflow-hidden items-center"
-              >
-                <ul v-if="labels.length" class="flex gap-1 mr-4">
-                  <li v-for="id in labels" :key="id">
-                    <UiProposalLabel
-                      :label="spaceLabels[id].name"
-                      :color="spaceLabels[id].color"
-                    />
-                  </li>
-                </ul>
-                <div
-                  class="flex items-center absolute rounded-r-full right-[1px] pr-2 h-[23px] bg-skin-bg"
-                >
-                  <div
-                    class="block w-2 -ml-2 h-full bg-gradient-to-l from-skin-bg"
-                  />
-                  <button
-                    v-if="labels.length"
-                    class="text-skin-text rounded-full hover:text-skin-link"
-                    title="Clear all labels"
-                    @click.stop="handleClearLabelsFilter(close)"
-                    @keydown.enter.stop="handleClearLabelsFilter(close)"
-                  >
-                    <IH-x-circle size="16" />
-                  </button>
-                </div>
-              </div>
-              <span v-else class="px-3 text-skin-link">Any</span>
-            </template>
-          </PickerLabel>
-        </div>
       </div>
       <div class="flex gap-2 truncate">
         <IndicatorVotingPower

From 8fb24bfa7a07c2ec468837159cf4367f55e92d44 Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:43:05 +0100
Subject: [PATCH 20/59] feat: add getDataByMessageHash data endpoint (#950)

* feat: add get data by message hash endpoint

* chore: fmt

* add type, hash, network

* chore: fmt
---
 apps/mana/src/db.ts          |  7 +++++++
 apps/mana/src/stark/index.ts |  3 ++-
 apps/mana/src/stark/rpc.ts   | 16 +++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/apps/mana/src/db.ts b/apps/mana/src/db.ts
index 59ef3a79f..7708e1e21 100644
--- a/apps/mana/src/db.ts
+++ b/apps/mana/src/db.ts
@@ -113,3 +113,10 @@ export async function markProposalProcessed(id: string) {
 export async function getProposal(id: string) {
   return knex(REGISTERED_PROPOSALS).select('*').where({ id }).first();
 }
+
+export async function getDataByMessageHash(hash: string) {
+  return knex(REGISTERED_TRANSACTIONS)
+    .select(['type', 'data', 'hash', 'network'])
+    .where({ hash })
+    .first();
+}
diff --git a/apps/mana/src/stark/index.ts b/apps/mana/src/stark/index.ts
index 9a86bd5eb..1c957bf66 100644
--- a/apps/mana/src/stark/index.ts
+++ b/apps/mana/src/stark/index.ts
@@ -15,7 +15,8 @@ const jsonRpcRequestSchema = z.object({
     'send',
     'execute',
     'registerTransaction',
-    'registerProposal'
+    'registerProposal',
+    'getDataByMessageHash'
   ]),
   params: z.any()
 });
diff --git a/apps/mana/src/stark/rpc.ts b/apps/mana/src/stark/rpc.ts
index 2b2bcb2ed..c240df5c5 100644
--- a/apps/mana/src/stark/rpc.ts
+++ b/apps/mana/src/stark/rpc.ts
@@ -137,11 +137,25 @@ export const createNetworkHandler = (chainId: string) => {
     }
   }
 
+  async function getDataByMessageHash(id: number, params: any, res: Response) {
+    try {
+      const { hash } = params;
+
+      const transaction = await db.getDataByMessageHash(hash);
+
+      return rpcSuccess(res, transaction, id);
+    } catch (e) {
+      console.log('Failed', e);
+      return rpcError(res, 500, e, id);
+    }
+  }
+
   return {
     send,
     execute,
     registerTransaction,
     registerProposal,
-    getAccount
+    getAccount,
+    getDataByMessageHash
   };
 };

From 273a986da051e41a0a1a28f739269fda169a20a8 Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Tue, 5 Nov 2024 13:18:01 +0100
Subject: [PATCH 21/59] fix: add sender to the returned info of
 getDataByMessageHash (#970)

---
 apps/mana/src/db.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mana/src/db.ts b/apps/mana/src/db.ts
index 7708e1e21..386a77579 100644
--- a/apps/mana/src/db.ts
+++ b/apps/mana/src/db.ts
@@ -116,7 +116,7 @@ export async function getProposal(id: string) {
 
 export async function getDataByMessageHash(hash: string) {
   return knex(REGISTERED_TRANSACTIONS)
-    .select(['type', 'data', 'hash', 'network'])
+    .select(['sender', 'type', 'data', 'hash', 'network'])
     .where({ hash })
     .first();
 }

From cc8112708e393967f4e4496ec1d7813f453aff7a Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:16:19 +0100
Subject: [PATCH 22/59] sx.js: use address instead of signer for ethereum-tx
 methods (#969)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* use address instead of signer for ethereum-tx methods

* explicitly state updates functions

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>

---------

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>
---
 .changeset/odd-apples-explain.md              |  5 +++
 .../src/clients/starknet/ethereum-tx/index.ts | 42 ++++++++-----------
 .../starknet/ethereum-tx/index.test.ts        |  6 +--
 3 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/odd-apples-explain.md

diff --git a/.changeset/odd-apples-explain.md b/.changeset/odd-apples-explain.md
new file mode 100644
index 000000000..d4659e0f7
--- /dev/null
+++ b/.changeset/odd-apples-explain.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": minor
+---
+
+Use `address` instead of `signer` for following methods in Starknet EthereumTx client: `estimateProposeFee`, `estimateVoteFee`, `estimateUpdateProposalFee`, `getProposeHash`, `getVoteHash`, `getUpdateProposalHash`.
diff --git a/packages/sx.js/src/clients/starknet/ethereum-tx/index.ts b/packages/sx.js/src/clients/starknet/ethereum-tx/index.ts
index 4c18fbaab..f1cae639b 100644
--- a/packages/sx.js/src/clients/starknet/ethereum-tx/index.ts
+++ b/packages/sx.js/src/clients/starknet/ethereum-tx/index.ts
@@ -221,9 +221,8 @@ export class EthereumTx {
     return fees as any;
   }
 
-  async estimateProposeFee(signer: Signer, data: Propose) {
-    const address = await signer.getAddress();
-    const hash = await this.getProposeHash(signer, data);
+  async estimateProposeFee(address: string, data: Propose) {
+    const hash = await this.getProposeHash(address, data);
 
     return this.getMessageFee(data.authenticator, [
       address.toLocaleLowerCase(),
@@ -231,9 +230,8 @@ export class EthereumTx {
     ]);
   }
 
-  async estimateVoteFee(signer: Signer, data: Vote) {
-    const address = await signer.getAddress();
-    const hash = await this.getVoteHash(signer, data);
+  async estimateVoteFee(address: string, data: Vote) {
+    const hash = await this.getVoteHash(address, data);
 
     return this.getMessageFee(data.authenticator, [
       address.toLocaleLowerCase(),
@@ -241,9 +239,8 @@ export class EthereumTx {
     ]);
   }
 
-  async estimateUpdateProposalFee(signer: Signer, data: UpdateProposal) {
-    const address = await signer.getAddress();
-    const hash = await this.getUpdateProposalHash(signer, data);
+  async estimateUpdateProposalFee(address: string, data: UpdateProposal) {
+    const hash = await this.getUpdateProposalHash(address, data);
 
     return this.getMessageFee(data.authenticator, [
       address.toLocaleLowerCase(),
@@ -251,9 +248,7 @@ export class EthereumTx {
     ]);
   }
 
-  async getProposeHash(signer: Signer, data: Propose) {
-    const address = await signer.getAddress();
-
+  async getProposeHash(address: string, data: Propose) {
     const userStrategies = await getStrategiesWithParams(
       'propose',
       data.strategies,
@@ -280,9 +275,7 @@ export class EthereumTx {
     return `0x${poseidonHashMany(compiled.map(v => BigInt(v))).toString(16)}`;
   }
 
-  async getVoteHash(signer: Signer, data: Vote) {
-    const address = await signer.getAddress();
-
+  async getVoteHash(address: string, data: Vote) {
     const userVotingStrategies = await getStrategiesWithParams(
       'vote',
       data.strategies,
@@ -305,9 +298,7 @@ export class EthereumTx {
     return `0x${poseidonHashMany(compiled.map(v => BigInt(v))).toString(16)}`;
   }
 
-  async getUpdateProposalHash(signer: Signer, data: UpdateProposal) {
-    const address = await signer.getAddress();
-
+  async getUpdateProposalHash(address: string, data: UpdateProposal) {
     const callData = new CallData(ENCODE_ABI);
     const compiled = callData.compile('update_proposal', [
       data.space,
@@ -335,8 +326,9 @@ export class EthereumTx {
       signer
     );
 
-    const hash = await this.getProposeHash(signer, data);
-    const { overall_fee } = await this.estimateProposeFee(signer, data);
+    const address = await signer.getAddress();
+    const hash = await this.getProposeHash(address, data);
+    const { overall_fee } = await this.estimateProposeFee(address, data);
 
     const promise = commitContract.commit(data.authenticator, hash, {
       value: overall_fee,
@@ -366,8 +358,9 @@ export class EthereumTx {
       signer
     );
 
-    const hash = await this.getVoteHash(signer, data);
-    const { overall_fee } = await this.estimateVoteFee(signer, data);
+    const address = await signer.getAddress();
+    const hash = await this.getVoteHash(address, data);
+    const { overall_fee } = await this.estimateVoteFee(address, data);
 
     const promise = commitContract.commit(data.authenticator, hash, {
       value: overall_fee,
@@ -397,8 +390,9 @@ export class EthereumTx {
       signer
     );
 
-    const hash = await this.getUpdateProposalHash(signer, data);
-    const { overall_fee } = await this.estimateUpdateProposalFee(signer, data);
+    const address = await signer.getAddress();
+    const hash = await this.getUpdateProposalHash(address, data);
+    const { overall_fee } = await this.estimateUpdateProposalFee(address, data);
 
     const promise = commitContract.commit(data.authenticator, hash, {
       value: overall_fee,
diff --git a/packages/sx.js/test/unit/clients/starknet/ethereum-tx/index.test.ts b/packages/sx.js/test/unit/clients/starknet/ethereum-tx/index.test.ts
index d0b67ef96..56f87b62e 100644
--- a/packages/sx.js/test/unit/clients/starknet/ethereum-tx/index.test.ts
+++ b/packages/sx.js/test/unit/clients/starknet/ethereum-tx/index.test.ts
@@ -38,7 +38,7 @@ describe('EthereumTx', () => {
       metadataUri: 'ipfs://QmNrm6xKuib1THtWkiN5CKtBEerQCDpUtmgDqiaU2xDmca'
     };
 
-    const result = await ethereumTx.getProposeHash(wallet, data);
+    const result = await ethereumTx.getProposeHash(wallet.address, data);
     expect(result).toEqual(
       '0x6ad6a7880f1ed8213c56ce9fcc0fc50eaca6fffbbd8546ff211825519bc9032'
     );
@@ -60,7 +60,7 @@ describe('EthereumTx', () => {
       metadataUri: 'ipfs://QmNrm6xKuib1THtWkiN5CKtBEerQCDpUtmgDqiaU2xDmca'
     };
 
-    const result = await ethereumTx.getVoteHash(wallet, data);
+    const result = await ethereumTx.getVoteHash(wallet.address, data);
     expect(result).toEqual(
       '0x15c3ec5ebb1e82803db2d695eb12a902d5bb0d52c63e1536015e6d3debe70'
     );
@@ -79,7 +79,7 @@ describe('EthereumTx', () => {
       metadataUri: 'ipfs://QmNrm6xKuib1THtWkiN5CKtBEerQCDpUtmgDqiaU2xDmca'
     };
 
-    const result = await ethereumTx.getUpdateProposalHash(wallet, data);
+    const result = await ethereumTx.getUpdateProposalHash(wallet.address, data);
     expect(result).toEqual(
       '0x612204abe7ec1f8975360b848882b53578bbc03bf2bac834c9566cc828a2ab4'
     );

From 06b062c6675be71f9d92a9d4077ef5e82901aa7e Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:22:14 +0800
Subject: [PATCH 23/59] refactor: move Space `terms` property to main Space
 type  (#964)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: move terms property to Space main type

* Update apps/ui/src/networks/common/graphqlApi/types.ts

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>

---------

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>
---
 apps/ui/src/composables/useSpaceSettings.ts     | 6 ++----
 apps/ui/src/networks/common/graphqlApi/index.ts | 1 +
 apps/ui/src/networks/offchain/api/index.ts      | 2 +-
 apps/ui/src/networks/offchain/api/types.ts      | 2 +-
 apps/ui/src/types.ts                            | 2 +-
 apps/ui/src/views/Create.vue                    | 1 +
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/ui/src/composables/useSpaceSettings.ts b/apps/ui/src/composables/useSpaceSettings.ts
index bb5fbe0d8..7328a8fe5 100644
--- a/apps/ui/src/composables/useSpaceSettings.ts
+++ b/apps/ui/src/composables/useSpaceSettings.ts
@@ -722,7 +722,7 @@ export function useSpaceSettings(space: Ref<Space>) {
       members.value = getInitialMembers(space.value);
       parent.value = space.value.parent?.id ?? '';
       children.value = space.value.children.map(child => child.id);
-      termsOfServices.value = space.value.additionalRawData?.terms ?? '';
+      termsOfServices.value = space.value.terms ?? '';
       customDomain.value = space.value.additionalRawData?.domain ?? '';
       isPrivate.value = space.value.additionalRawData?.private ?? false;
     }
@@ -900,9 +900,7 @@ export function useSpaceSettings(space: Ref<Space>) {
         return;
       }
 
-      if (
-        termsOfServicesValue !== (space.value.additionalRawData?.terms ?? '')
-      ) {
+      if (termsOfServicesValue !== (space.value.terms ?? '')) {
         isModified.value = true;
         return;
       }
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index c0da8b354..2feb6c602 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -182,6 +182,7 @@ function formatSpace(
     github: space.metadata.github,
     twitter: space.metadata.twitter,
     discord: space.metadata.discord,
+    terms: '',
     voting_power_symbol: space.metadata.voting_power_symbol,
     voting_types: constants.EDITOR_VOTING_TYPES,
     treasuries: space.metadata.treasuries.map(treasury => {
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index 55f5f6cb8..22e669d01 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -137,7 +137,6 @@ function formatSpace(
 
   const additionalRawData: OffchainAdditionalRawData = {
     type: 'offchain',
-    terms: space.terms,
     private: space.private,
     domain: space.domain,
     skin: space.skin,
@@ -209,6 +208,7 @@ function formatSpace(
     voting_power_validation_strategies_parsed_metadata: [],
     children: space.children.map(formatRelatedSpace),
     parent: space.parent ? formatRelatedSpace(space.parent) : null,
+    terms: space.terms,
     additionalRawData
   };
 }
diff --git a/apps/ui/src/networks/offchain/api/types.ts b/apps/ui/src/networks/offchain/api/types.ts
index 61e8c31f0..2363fe055 100644
--- a/apps/ui/src/networks/offchain/api/types.ts
+++ b/apps/ui/src/networks/offchain/api/types.ts
@@ -71,8 +71,8 @@ export type ApiSpace = {
   followersCount: number;
   children: [ApiRelatedSpace];
   parent: ApiRelatedSpace | null;
-  // properties used for settings
   terms: string;
+  // properties used for settings
   private: boolean;
   domain: string | null;
   skin: string | null;
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index 72e4eaee0..88cd8c5a7 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -135,7 +135,6 @@ export type OffchainAdditionalRawData = {
   type: 'offchain';
 } & Pick<
   OffchainApiSpace,
-  | 'terms'
   | 'private'
   | 'domain'
   | 'skin'
@@ -173,6 +172,7 @@ export type Space = {
   github: string;
   discord: string;
   coingecko?: string;
+  terms: string;
   voting_power_symbol: string;
   controller: string;
   voting_delay: number;
diff --git a/apps/ui/src/views/Create.vue b/apps/ui/src/views/Create.vue
index dcbe59f28..609a93b8f 100644
--- a/apps/ui/src/views/Create.vue
+++ b/apps/ui/src/views/Create.vue
@@ -68,6 +68,7 @@ const metadataForm: SpaceMetadata = reactive(
     twitter: '',
     github: '',
     discord: '',
+    terms: '',
     votingPowerSymbol: '',
     treasuries: [],
     labels: [],

From ae4e99adecde3e237285b05dae5c22f469eaa89e Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:15:24 +0100
Subject: [PATCH 24/59] fix: patch bump instead of minor bump (#972)

---
 .changeset/odd-apples-explain.md  | 2 +-
 .changeset/strange-ducks-shake.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/odd-apples-explain.md b/.changeset/odd-apples-explain.md
index d4659e0f7..efb61c438 100644
--- a/.changeset/odd-apples-explain.md
+++ b/.changeset/odd-apples-explain.md
@@ -1,5 +1,5 @@
 ---
-"@snapshot-labs/sx": minor
+"@snapshot-labs/sx": patch
 ---
 
 Use `address` instead of `signer` for following methods in Starknet EthereumTx client: `estimateProposeFee`, `estimateVoteFee`, `estimateUpdateProposalFee`, `getProposeHash`, `getVoteHash`, `getUpdateProposalHash`.
diff --git a/.changeset/strange-ducks-shake.md b/.changeset/strange-ducks-shake.md
index 95f8ea166..2d9a98275 100644
--- a/.changeset/strange-ducks-shake.md
+++ b/.changeset/strange-ducks-shake.md
@@ -1,5 +1,5 @@
 ---
-"@snapshot-labs/sx": minor
+"@snapshot-labs/sx": patch
 ---
 
 Support labels on proposals

From 7f41b7e73044500604080aaf137ccf06f1788580 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:28:04 +0100
Subject: [PATCH 25/59] chore: version packages (#753)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/eight-icons-explain.md   |  5 -----
 .changeset/gentle-peas-nail.md      |  5 -----
 .changeset/late-trees-compete.md    |  5 -----
 .changeset/neat-falcons-pay.md      |  5 -----
 .changeset/odd-apples-explain.md    |  5 -----
 .changeset/smooth-moose-smell.md    |  5 -----
 .changeset/strange-ducks-shake.md   |  5 -----
 .changeset/sweet-papayas-provide.md |  5 -----
 .changeset/twenty-cups-hope.md      |  5 -----
 packages/sx.js/CHANGELOG.md         | 14 ++++++++++++++
 packages/sx.js/package.json         |  2 +-
 11 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 .changeset/eight-icons-explain.md
 delete mode 100644 .changeset/gentle-peas-nail.md
 delete mode 100644 .changeset/late-trees-compete.md
 delete mode 100644 .changeset/neat-falcons-pay.md
 delete mode 100644 .changeset/odd-apples-explain.md
 delete mode 100644 .changeset/smooth-moose-smell.md
 delete mode 100644 .changeset/strange-ducks-shake.md
 delete mode 100644 .changeset/sweet-papayas-provide.md
 delete mode 100644 .changeset/twenty-cups-hope.md

diff --git a/.changeset/eight-icons-explain.md b/.changeset/eight-icons-explain.md
deleted file mode 100644
index cff131305..000000000
--- a/.changeset/eight-icons-explain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-fix evm slot value strategy cached_timestamps lookup
diff --git a/.changeset/gentle-peas-nail.md b/.changeset/gentle-peas-nail.md
deleted file mode 100644
index 0dbf65459..000000000
--- a/.changeset/gentle-peas-nail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-remove networks with empty config
diff --git a/.changeset/late-trees-compete.md b/.changeset/late-trees-compete.md
deleted file mode 100644
index 231604766..000000000
--- a/.changeset/late-trees-compete.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-set ethsig offchain vote app property
diff --git a/.changeset/neat-falcons-pay.md b/.changeset/neat-falcons-pay.md
deleted file mode 100644
index cd0bdc466..000000000
--- a/.changeset/neat-falcons-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-disable estimation for initialize EthTx calls
diff --git a/.changeset/odd-apples-explain.md b/.changeset/odd-apples-explain.md
deleted file mode 100644
index efb61c438..000000000
--- a/.changeset/odd-apples-explain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-Use `address` instead of `signer` for following methods in Starknet EthereumTx client: `estimateProposeFee`, `estimateVoteFee`, `estimateUpdateProposalFee`, `getProposeHash`, `getVoteHash`, `getUpdateProposalHash`.
diff --git a/.changeset/smooth-moose-smell.md b/.changeset/smooth-moose-smell.md
deleted file mode 100644
index 4d6d5f0fb..000000000
--- a/.changeset/smooth-moose-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-add updateSettings method to offchain EthereumSig client
diff --git a/.changeset/strange-ducks-shake.md b/.changeset/strange-ducks-shake.md
deleted file mode 100644
index 2d9a98275..000000000
--- a/.changeset/strange-ducks-shake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-Support labels on proposals
diff --git a/.changeset/sweet-papayas-provide.md b/.changeset/sweet-papayas-provide.md
deleted file mode 100644
index 6d8253cbb..000000000
--- a/.changeset/sweet-papayas-provide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-add deleteSpace method to offchain ethSig client
diff --git a/.changeset/twenty-cups-hope.md b/.changeset/twenty-cups-hope.md
deleted file mode 100644
index 7bcf0522f..000000000
--- a/.changeset/twenty-cups-hope.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-fix ethSig updateProposal call to properly include author
diff --git a/packages/sx.js/CHANGELOG.md b/packages/sx.js/CHANGELOG.md
index fcfd4f40a..00202dc64 100644
--- a/packages/sx.js/CHANGELOG.md
+++ b/packages/sx.js/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @snapshot-labs/sx
 
+## 0.1.5
+
+### Patch Changes
+
+- ce35884: fix evm slot value strategy cached_timestamps lookup
+- e4ccc72: remove networks with empty config
+- 1bbd2c3: set ethsig offchain vote app property
+- 94652af: disable estimation for initialize EthTx calls
+- cc81127: Use `address` instead of `signer` for following methods in Starknet EthereumTx client: `estimateProposeFee`, `estimateVoteFee`, `estimateUpdateProposalFee`, `getProposeHash`, `getVoteHash`, `getUpdateProposalHash`.
+- 4627095: add updateSettings method to offchain EthereumSig client
+- 797f5e3: Support labels on proposals
+- aa87e0c: add deleteSpace method to offchain ethSig client
+- ef1429d: fix ethSig updateProposal call to properly include author
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/sx.js/package.json b/packages/sx.js/package.json
index 4e74cef5e..6c01e7049 100644
--- a/packages/sx.js/package.json
+++ b/packages/sx.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/sx",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "publishConfig": {
     "access": "public"
   },

From 8953af7cae9396d711f9cb0aaee8c5f6f1078256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Wed, 6 Nov 2024 17:03:48 +0100
Subject: [PATCH 26/59] chore: bump @checkpoint-labs/checkpoint to
 0.1.0-beta.41 (#973)

---
 apps/api/package.json | 2 +-
 yarn.lock             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index 98670d6f3..f85e540fe 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -23,7 +23,7 @@
     "@ethersproject/providers": "^5.7.2",
     "@ethersproject/units": "^5.6.1",
     "@faker-js/faker": "^7.4.0",
-    "@snapshot-labs/checkpoint": "^0.1.0-beta.39",
+    "@snapshot-labs/checkpoint": "^0.1.0-beta.41",
     "@snapshot-labs/sx": "^0.1.0",
     "@types/bn.js": "^5.1.0",
     "@types/mysql": "^2.15.21",
diff --git a/yarn.lock b/yarn.lock
index f3b308528..ffadc4f38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2445,10 +2445,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@snapshot-labs/checkpoint@^0.1.0-beta.39":
-  version "0.1.0-beta.39"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.39.tgz#a0d76887e1456a519f6567bcb76380229610dbb4"
-  integrity sha512-VQ2ZAkrAlH8Zl1jrXS9Hlm4iODtytbFdSG6a/Tejj3KRiic2SHiXDYCy/DDRnazpKy+qQ3qqwe+QYUQF+wtBGw==
+"@snapshot-labs/checkpoint@^0.1.0-beta.41":
+  version "0.1.0-beta.41"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.41.tgz#ebf77170d40402c2f2039a4002ca23aa54107b92"
+  integrity sha512-aIlDDbWEfVT5QDSUYSuK3XieAOPwM+vuI3aikvgf3J2Uqd462NB1e/1RJPHFGZ5/PaZvlwk6xPMgJsC6ZtlBmw==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     "@ethersproject/address" "^5.7.0"

From 9a6a19cccb557f03c52cafbffd1c6939f375d352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Thu, 7 Nov 2024 16:28:23 +0100
Subject: [PATCH 27/59] chore: bump @checkpoint-labs/checkpoint to
 0.1.0-beta.42 (#975)

---
 apps/api/package.json | 2 +-
 yarn.lock             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index f85e540fe..bdb2fba43 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -23,7 +23,7 @@
     "@ethersproject/providers": "^5.7.2",
     "@ethersproject/units": "^5.6.1",
     "@faker-js/faker": "^7.4.0",
-    "@snapshot-labs/checkpoint": "^0.1.0-beta.41",
+    "@snapshot-labs/checkpoint": "^0.1.0-beta.42",
     "@snapshot-labs/sx": "^0.1.0",
     "@types/bn.js": "^5.1.0",
     "@types/mysql": "^2.15.21",
diff --git a/yarn.lock b/yarn.lock
index ffadc4f38..96822f76d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2445,10 +2445,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@snapshot-labs/checkpoint@^0.1.0-beta.41":
-  version "0.1.0-beta.41"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.41.tgz#ebf77170d40402c2f2039a4002ca23aa54107b92"
-  integrity sha512-aIlDDbWEfVT5QDSUYSuK3XieAOPwM+vuI3aikvgf3J2Uqd462NB1e/1RJPHFGZ5/PaZvlwk6xPMgJsC6ZtlBmw==
+"@snapshot-labs/checkpoint@^0.1.0-beta.42":
+  version "0.1.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.42.tgz#5f50cdf7c15df1126a857b1f0efbc88caa1382e4"
+  integrity sha512-ZUoDrtAVWi4SgGHO4JIdphg28N+NpbP5oBSEfceIhMIakGmP1nR2+teQTV/rJCTut+x5zTKJkwyXbdxfkcmIYw==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     "@ethersproject/address" "^5.7.0"

From 59b41a402be802d7c7486b73eabc9d6e231a1253 Mon Sep 17 00:00:00 2001
From: Less <bonustrack@users.noreply.github.com>
Date: Fri, 8 Nov 2024 03:36:15 +0700
Subject: [PATCH 28/59] chore: bump @checkpoint-labs/checkpoint to
 0.1.0-beta.42 (#977)

* chore: bump @checkpoint-labs/checkpoint to 0.1.0-beta.42

* chore: remove extra changes on yarn.lock
---
 apps/api/package.json | 2 +-
 yarn.lock             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index bdb2fba43..f99b0411e 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -23,7 +23,7 @@
     "@ethersproject/providers": "^5.7.2",
     "@ethersproject/units": "^5.6.1",
     "@faker-js/faker": "^7.4.0",
-    "@snapshot-labs/checkpoint": "^0.1.0-beta.42",
+    "@snapshot-labs/checkpoint": "^0.1.0-beta.43",
     "@snapshot-labs/sx": "^0.1.0",
     "@types/bn.js": "^5.1.0",
     "@types/mysql": "^2.15.21",
diff --git a/yarn.lock b/yarn.lock
index 96822f76d..6ec3b8b4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2445,10 +2445,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@snapshot-labs/checkpoint@^0.1.0-beta.42":
-  version "0.1.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.42.tgz#5f50cdf7c15df1126a857b1f0efbc88caa1382e4"
-  integrity sha512-ZUoDrtAVWi4SgGHO4JIdphg28N+NpbP5oBSEfceIhMIakGmP1nR2+teQTV/rJCTut+x5zTKJkwyXbdxfkcmIYw==
+"@snapshot-labs/checkpoint@^0.1.0-beta.43":
+  version "0.1.0-beta.43"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.43.tgz#56118320a17ff7cda46364ad70b399fd3b8ec869"
+  integrity sha512-GIGEx6OQlDyfxfLapyXsWMVhEvzRJ51V9cIAvjG1htrVBhnuFmo321SxAdioMcsk98K0yU4qQWxcv4IFPmYB0w==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     "@ethersproject/address" "^5.7.0"

From d9349a0a992a07bfe36887fa4ae0731103dc1550 Mon Sep 17 00:00:00 2001
From: Chaitanya <yourchaitu@gmail.com>
Date: Fri, 8 Nov 2024 11:47:34 +0530
Subject: [PATCH 29/59] fix: Allow snapshot in fantom safe and add fantom
 networks to WC (#976)

---
 apps/ui/src/helpers/connectors.ts | 2 +-
 apps/ui/src/main.ts               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/helpers/connectors.ts b/apps/ui/src/helpers/connectors.ts
index 53d40f9fe..248ad888a 100644
--- a/apps/ui/src/helpers/connectors.ts
+++ b/apps/ui/src/helpers/connectors.ts
@@ -22,7 +22,7 @@ export default {
     options: {
       projectId: 'e6454bd61aba40b786e866a69bd4c5c6',
       chains: [],
-      optionalChains: [1, 10, 56, 100, 42161, 137, 1088, 11155111],
+      optionalChains: [1, 10, 56, 100, 250, 4002, 42161, 137, 1088, 11155111],
       optionalMethods: ['eth_sendTransaction', 'eth_signTypedData_v4'],
       showQrModal: true
     }
diff --git a/apps/ui/src/main.ts b/apps/ui/src/main.ts
index 2193bc61a..43a36a035 100644
--- a/apps/ui/src/main.ts
+++ b/apps/ui/src/main.ts
@@ -15,7 +15,8 @@ const knownHosts = [
   'multisig.moonbeam.network',
   'worldassociation.org',
   'safe.mainnet.frax.com',
-  'horizen-eon.safe.onchainden.com'
+  'horizen-eon.safe.onchainden.com',
+  'safe.fantom.network'
 ];
 const parentUrl =
   window.location != window.parent.location

From 7a85ef33af87f344d92859b58fed5c6cab0f5f66 Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:58:54 +0100
Subject: [PATCH 30/59] chore: remove needless log (#974)

* Revert "chore: log EVM slot value error"

This reverts commit 1680d5c87d404e46a9e62bdc1589787e5bea5fb5.

* Revert "chore: log EVM slot value error"

This reverts commit 799c3a50b90a0277510a9962f0ff23b50b9d1c42.

* patch bump
---
 .changeset/great-nails-wink.md                         | 5 +++++
 packages/sx.js/src/strategies/starknet/evmSlotValue.ts | 1 -
 packages/sx.js/src/utils/strategies.ts                 | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/great-nails-wink.md

diff --git a/.changeset/great-nails-wink.md b/.changeset/great-nails-wink.md
new file mode 100644
index 000000000..230840ef1
--- /dev/null
+++ b/.changeset/great-nails-wink.md
@@ -0,0 +1,5 @@
+---
+"@snapshot-labs/sx": patch
+---
+
+Remove extraneous logs
diff --git a/packages/sx.js/src/strategies/starknet/evmSlotValue.ts b/packages/sx.js/src/strategies/starknet/evmSlotValue.ts
index a63557a40..43176fd90 100644
--- a/packages/sx.js/src/strategies/starknet/evmSlotValue.ts
+++ b/packages/sx.js/src/strategies/starknet/evmSlotValue.ts
@@ -132,7 +132,6 @@ export default function createEvmSlotValueStrategy(): Strategy {
       try {
         l1BlockNumber = await contract.cached_timestamps(timestamp);
       } catch (e) {
-        console.log('failed with', e);
         throw new VotingPowerDetailsError(
           'Timestamp is not cached',
           type,
diff --git a/packages/sx.js/src/utils/strategies.ts b/packages/sx.js/src/utils/strategies.ts
index 35b152cb9..6aebf1d04 100644
--- a/packages/sx.js/src/utils/strategies.ts
+++ b/packages/sx.js/src/utils/strategies.ts
@@ -61,7 +61,6 @@ export async function getStrategiesWithParams(
           params
         };
       } catch (e) {
-        console.log('failed with', e);
         return null;
       }
     })

From 1d471eac7782a799673bd9d6cc8eaccb7d360ca8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:43:41 +0100
Subject: [PATCH 31/59] chore: version packages (#979)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/great-nails-wink.md | 5 -----
 packages/sx.js/CHANGELOG.md    | 6 ++++++
 packages/sx.js/package.json    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/great-nails-wink.md

diff --git a/.changeset/great-nails-wink.md b/.changeset/great-nails-wink.md
deleted file mode 100644
index 230840ef1..000000000
--- a/.changeset/great-nails-wink.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@snapshot-labs/sx": patch
----
-
-Remove extraneous logs
diff --git a/packages/sx.js/CHANGELOG.md b/packages/sx.js/CHANGELOG.md
index 00202dc64..002be5d78 100644
--- a/packages/sx.js/CHANGELOG.md
+++ b/packages/sx.js/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @snapshot-labs/sx
 
+## 0.1.6
+
+### Patch Changes
+
+- 7a85ef3: Remove extraneous logs
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/sx.js/package.json b/packages/sx.js/package.json
index 6c01e7049..80b1dcc87 100644
--- a/packages/sx.js/package.json
+++ b/packages/sx.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/sx",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "publishConfig": {
     "access": "public"
   },

From 71ae98ed3a98a9009ba4874b2fea82f04d5c161a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:48:33 +0530
Subject: [PATCH 32/59] chore(deps): bump @snapshot-labs/snapshot.js in the
 snapshot group (#980)

Bumps the snapshot group with 1 update: [@snapshot-labs/snapshot.js](https://github.com/snapshot-labs/snapshot.js).


Updates `@snapshot-labs/snapshot.js` from 0.12.28 to 0.12.29
- [Release notes](https://github.com/snapshot-labs/snapshot.js/releases)
- [Commits](https://github.com/snapshot-labs/snapshot.js/compare/v0.12.28...v0.12.29)

---
updated-dependencies:
- dependency-name: "@snapshot-labs/snapshot.js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: snapshot
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/ui/package.json | 2 +-
 yarn.lock            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/package.json b/apps/ui/package.json
index 6d2a4963c..2487d34e3 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -50,7 +50,7 @@
     "@snapshot-labs/lock": "^0.2.8",
     "@snapshot-labs/pineapple": "^1.1.0",
     "@snapshot-labs/prettier-config": "^0.1.0-beta.18",
-    "@snapshot-labs/snapshot.js": "^0.12.28",
+    "@snapshot-labs/snapshot.js": "^0.12.29",
     "@snapshot-labs/sx": "^0.1.0",
     "@vueuse/core": "^10.4.1",
     "@walletconnect/core": "^2.11.0",
diff --git a/yarn.lock b/yarn.lock
index 6ec3b8b4a..bc086bef4 100644
--- 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.28":
-  version "0.12.28"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.28.tgz#6f6644038c9df06daaea508b57d0b3d5d7a55cd9"
-  integrity sha512-F2rwwgkV1NtYeeOy1Tl1qemJvm7Ux/D8mM5k/+uD53ptWsX6//zlv9daajZjT+7h7pYqycKvNJJE1f7Rr0m4cQ==
+"@snapshot-labs/snapshot.js@^0.12.29":
+  version "0.12.29"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.29.tgz#ea629acccd95afd84d62a1202de03fe2dc84ab53"
+  integrity sha512-pfyc6ZsuCLoitH0FqYfPiBFZEsYN+i0atWEA3ubQozA/g9sOgDKRyChHoj8A7lEkkNT7gt4J9xKoDk3jo6CTNw==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From f57a4359d0ecbc5121a3f78bd5f4311543c99470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Sat, 16 Nov 2024 17:26:50 +0100
Subject: [PATCH 33/59] test: improve speed of starknet integration tests 10x
 (#981)

The issue is with starknetjs implementation of waitForTransaction,
that will always take at least 10s with default settings.

We can improve it a lot by just decreasing intervals.

https://github.com/starknet-io/starknet.js/issues/1237#issuecomment-2475861985
---
 .../test/integration/starknet/index.test.ts   | 30 ++++++++++++++-----
 .../sx.js/test/integration/starknet/utils.ts  |  4 +++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/packages/sx.js/test/integration/starknet/index.test.ts b/packages/sx.js/test/integration/starknet/index.test.ts
index 201bd0d8f..6538a6a2e 100644
--- a/packages/sx.js/test/integration/starknet/index.test.ts
+++ b/packages/sx.js/test/integration/starknet/index.test.ts
@@ -10,6 +10,7 @@ import {
   increaseTime,
   setTime,
   setup,
+  sleep,
   TestConfig
 } from './utils';
 import {
@@ -36,7 +37,10 @@ describe('sx-starknet', () => {
   const privateKey = '0x9c7d498a8f76dc87564274036988f668';
 
   const starkProvider = new RpcProvider({
-    nodeUrl: 'http://127.0.0.1:5050/rpc'
+    nodeUrl: 'http://127.0.0.1:5050/rpc',
+    // default is 5s and for some reason each call with call it 2 times (one before looking for receipt, and once after)
+    // this way it's quick (20s instead of 9 minutes)
+    transactionRetryIntervalFallback: 100
   });
 
   const provider = new JsonRpcProvider(ethUrl);
@@ -145,7 +149,8 @@ describe('sx-starknet', () => {
             }
           ],
           proposal: 1,
-          choice: Choice.For
+          choice: Choice.For,
+          metadataUri: ''
         }
       };
 
@@ -197,7 +202,8 @@ describe('sx-starknet', () => {
           }
         ],
         proposal: 2,
-        choice: Choice.For
+        choice: Choice.For,
+        metadataUri: ''
       };
 
       const envelope = await ethSigClient.vote({ signer: wallet, data });
@@ -256,7 +262,8 @@ describe('sx-starknet', () => {
           }
         ],
         proposal: 3,
-        choice: Choice.For
+        choice: Choice.For,
+        metadataUri: ''
       };
 
       await ethTxClient.initializeVote(wallet, data);
@@ -315,7 +322,8 @@ describe('sx-starknet', () => {
           }
         ],
         proposal: 4,
-        choice: Choice.For
+        choice: Choice.For,
+        metadataUri: ''
       };
 
       const envelope = await starkSigClient.vote({ signer: account, data });
@@ -375,7 +383,8 @@ describe('sx-starknet', () => {
             }
           ],
           proposal: 5,
-          choice: Choice.For
+          choice: Choice.For,
+          metadataUri: ''
         }
       };
 
@@ -436,7 +445,8 @@ describe('sx-starknet', () => {
             }
           ],
           proposal: 6,
-          choice: Choice.For
+          choice: Choice.For,
+          metadataUri: ''
         }
       };
 
@@ -495,10 +505,14 @@ describe('sx-starknet', () => {
             }
           ],
           proposal: 7,
-          choice: Choice.For
+          choice: Choice.For,
+          metadataUri: ''
         }
       };
 
+      // NOTE: to avoid Votes: future lookup
+      await sleep(10000);
+
       const receipt = await client.vote(account, envelope);
       console.log('Receipt', receipt);
 
diff --git a/packages/sx.js/test/integration/starknet/utils.ts b/packages/sx.js/test/integration/starknet/utils.ts
index 24479bf48..33d20e250 100644
--- a/packages/sx.js/test/integration/starknet/utils.ts
+++ b/packages/sx.js/test/integration/starknet/utils.ts
@@ -539,3 +539,7 @@ export function loadL1MessagingContract(networkUrl: string, address: string) {
 export function flush() {
   return postDevnet('postman/flush', {});
 }
+
+export function sleep(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}

From 90473d2f51868af062cb5a1715c20f0262a18be9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 00:28:02 +0530
Subject: [PATCH 34/59] chore(deps): bump @snapshot-labs/snapshot.js in the
 snapshot group (#983)

Bumps the snapshot group with 1 update: [@snapshot-labs/snapshot.js](https://github.com/snapshot-labs/snapshot.js).


Updates `@snapshot-labs/snapshot.js` from 0.12.29 to 0.12.30
- [Release notes](https://github.com/snapshot-labs/snapshot.js/releases)
- [Commits](https://github.com/snapshot-labs/snapshot.js/compare/v0.12.29...0.12.30)

---
updated-dependencies:
- dependency-name: "@snapshot-labs/snapshot.js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: snapshot
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/ui/package.json | 2 +-
 yarn.lock            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/package.json b/apps/ui/package.json
index 2487d34e3..cd9f67317 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -50,7 +50,7 @@
     "@snapshot-labs/lock": "^0.2.8",
     "@snapshot-labs/pineapple": "^1.1.0",
     "@snapshot-labs/prettier-config": "^0.1.0-beta.18",
-    "@snapshot-labs/snapshot.js": "^0.12.29",
+    "@snapshot-labs/snapshot.js": "^0.12.30",
     "@snapshot-labs/sx": "^0.1.0",
     "@vueuse/core": "^10.4.1",
     "@walletconnect/core": "^2.11.0",
diff --git a/yarn.lock b/yarn.lock
index bc086bef4..f6ca16ea2 100644
--- 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.29":
-  version "0.12.29"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.29.tgz#ea629acccd95afd84d62a1202de03fe2dc84ab53"
-  integrity sha512-pfyc6ZsuCLoitH0FqYfPiBFZEsYN+i0atWEA3ubQozA/g9sOgDKRyChHoj8A7lEkkNT7gt4J9xKoDk3jo6CTNw==
+"@snapshot-labs/snapshot.js@^0.12.30":
+  version "0.12.30"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.30.tgz#6441f906703084e24b2570d8b2f350c82cd6336f"
+  integrity sha512-E6LubPwtccJ8w9Ix9a/ZwAiz2BpDv35rB9hvIB8iCfOXJE3KgliLqETooVQSzmRKUDr+F9s+bwBh8uGaRdPn8w==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From a3fe34e51acd7176001c66abd2fa911b752e21f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 07:41:32 +0530
Subject: [PATCH 35/59] chore(deps): bump @snapshot-labs/snapshot.js in the
 snapshot group (#984)

Bumps the snapshot group with 1 update: [@snapshot-labs/snapshot.js](https://github.com/snapshot-labs/snapshot.js).


Updates `@snapshot-labs/snapshot.js` from 0.12.30 to 0.12.32
- [Release notes](https://github.com/snapshot-labs/snapshot.js/releases)
- [Commits](https://github.com/snapshot-labs/snapshot.js/compare/0.12.30...v0.12.32)

---
updated-dependencies:
- dependency-name: "@snapshot-labs/snapshot.js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: snapshot
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/ui/package.json | 2 +-
 yarn.lock            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/package.json b/apps/ui/package.json
index cd9f67317..a4ad16376 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -50,7 +50,7 @@
     "@snapshot-labs/lock": "^0.2.8",
     "@snapshot-labs/pineapple": "^1.1.0",
     "@snapshot-labs/prettier-config": "^0.1.0-beta.18",
-    "@snapshot-labs/snapshot.js": "^0.12.30",
+    "@snapshot-labs/snapshot.js": "^0.12.32",
     "@snapshot-labs/sx": "^0.1.0",
     "@vueuse/core": "^10.4.1",
     "@walletconnect/core": "^2.11.0",
diff --git a/yarn.lock b/yarn.lock
index f6ca16ea2..7bb30486d 100644
--- 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.30":
-  version "0.12.30"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.30.tgz#6441f906703084e24b2570d8b2f350c82cd6336f"
-  integrity sha512-E6LubPwtccJ8w9Ix9a/ZwAiz2BpDv35rB9hvIB8iCfOXJE3KgliLqETooVQSzmRKUDr+F9s+bwBh8uGaRdPn8w==
+"@snapshot-labs/snapshot.js@^0.12.32":
+  version "0.12.32"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.32.tgz#a92522c8563cf9849706ba6ea5592672aba8adde"
+  integrity sha512-GRmGMjcR8qdRE94QydVQVPf93lKjJp+J/ISoSTVp3oxKrkBEzY0DZx9gFlysBqF/h69PEeykJWUOH1YfQocYHw==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From df02187f7a846684cbff192977b51745fe8b405f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Fri, 22 Nov 2024 11:03:00 +0100
Subject: [PATCH 36/59] ci: run integration tests on CI (#985)

* ci: run integration tests on CI

* test: increase anvil's time for L1 execution

* ci: install Starknet Devnet in test workflow

* ci: cache cargo
---
 .github/workflows/test.yml                    | 15 ++++++++++
 package.json                                  |  1 +
 packages/sx.js/package.json                   |  1 +
 .../test/integration/starknet/index.test.ts   |  5 ++--
 .../sx.js/test/integration/starknet/utils.ts  |  4 ---
 packages/sx.js/test/run-integration-tests.sh  | 28 +++++++++++++++++++
 turbo.json                                    |  3 ++
 7 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100755 packages/sx.js/test/run-integration-tests.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd8d87a82..03de30e4c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,9 @@ name: CI
 
 on: [push]
 
+env:
+  STARKNET_DEVNET_VERSION: 0.2.3
+
 jobs:
   lint-build-test:
     runs-on: ubuntu-22.04
@@ -13,8 +16,20 @@ jobs:
         with:
           node-version: "18.x"
           cache: "yarn"
+      - name: Setup Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Restore Cargo
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo
+          key: ${{ runner.os }}-cargo-${{ env.STARKNET_DEVNET_VERSION }}
+      - name: Install Starknet Devnet
+        run: cargo install starknet-devnet@${{ env.STARKNET_DEVNET_VERSION }}
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
       - run: yarn --frozen-lockfile
       - run: yarn build
       - run: yarn typecheck
       - run: yarn lint
       - run: yarn test
+      - run: yarn test:integration
diff --git a/package.json b/package.json
index b48ce736e..b8342792e 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "dev:full": "./scripts/dev-full.sh",
     "build": "turbo run build",
     "test": "turbo run test",
+    "test:integration": "turbo run test:integration",
     "lint": "turbo run lint",
     "typecheck": "turbo run typecheck",
     "release": "yarn build && changeset publish"
diff --git a/packages/sx.js/package.json b/packages/sx.js/package.json
index 80b1dcc87..fd1d49989 100644
--- a/packages/sx.js/package.json
+++ b/packages/sx.js/package.json
@@ -24,6 +24,7 @@
     "node:evm": "anvil",
     "node:starknet": "starknet-devnet --seed 1",
     "test": "SEPOLIA_NODE_URL=https://rpc.snapshot.org/11155111 vitest run test/unit",
+    "test:integration": "./test/run-integration-tests.sh",
     "test:integration:starknet": "vitest run test/integration/starknet",
     "test:integration:evm": "vitest run test/integration/evm",
     "test:integration:offchain": "vitest run test/integration/offchain"
diff --git a/packages/sx.js/test/integration/starknet/index.test.ts b/packages/sx.js/test/integration/starknet/index.test.ts
index 6538a6a2e..9bb63fce8 100644
--- a/packages/sx.js/test/integration/starknet/index.test.ts
+++ b/packages/sx.js/test/integration/starknet/index.test.ts
@@ -10,7 +10,6 @@ import {
   increaseTime,
   setTime,
   setup,
-  sleep,
   TestConfig
 } from './utils';
 import {
@@ -510,8 +509,7 @@ describe('sx-starknet', () => {
         }
       };
 
-      // NOTE: to avoid Votes: future lookup
-      await sleep(10000);
+      await increaseTime(1000);
 
       const receipt = await client.vote(account, envelope);
       console.log('Receipt', receipt);
@@ -586,6 +584,7 @@ describe('sx-starknet', () => {
 
     it('should execute', async () => {
       await increaseTime(86400);
+      await provider.send('evm_increaseTime', [86400]);
 
       const { executionParams } = getExecutionData(
         'EthRelayer',
diff --git a/packages/sx.js/test/integration/starknet/utils.ts b/packages/sx.js/test/integration/starknet/utils.ts
index 33d20e250..24479bf48 100644
--- a/packages/sx.js/test/integration/starknet/utils.ts
+++ b/packages/sx.js/test/integration/starknet/utils.ts
@@ -539,7 +539,3 @@ export function loadL1MessagingContract(networkUrl: string, address: string) {
 export function flush() {
   return postDevnet('postman/flush', {});
 }
-
-export function sleep(ms: number) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
diff --git a/packages/sx.js/test/run-integration-tests.sh b/packages/sx.js/test/run-integration-tests.sh
new file mode 100755
index 000000000..637d1b3c3
--- /dev/null
+++ b/packages/sx.js/test/run-integration-tests.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+PIDS=()
+
+function start_node() {
+  yarn node:"$1" > /dev/null 2>&1 &
+  PIDS+=($!)
+  echo "Started $1 with PID $!"
+}
+
+function cleanup() {
+  echo "Cleaning up..."
+  for pid in "${PIDS[@]}"; do
+    echo "Killing process $pid"
+    kill "$pid" 2>/dev/null || echo "Process $pid already terminated"
+  done
+}
+
+trap cleanup EXIT
+
+start_node evm
+start_node starknet
+
+echo "Running evm tests"
+yarn test:integration:evm
+
+echo "Running starknet tests"
+yarn test:integration:starknet
diff --git a/turbo.json b/turbo.json
index 5a9cd18c7..f1b7cfb36 100644
--- a/turbo.json
+++ b/turbo.json
@@ -13,6 +13,9 @@
     "test": {
       "dependsOn": ["^build"]
     },
+    "test:integration": {
+      "dependsOn": ["^build"]
+    },
     "dev": {
       "cache": false,
       "persistent": true,

From 0f8e8a447dc057229659b828a7c7ccb3a7a12ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Fri, 22 Nov 2024 11:59:16 +0100
Subject: [PATCH 37/59] feat: add explore page Category and Network filters
 (#882)

* feat: add signle category filter on explore page

* feat: add network selector on Explore page

* fix: render dropdown below header

* feat: use combobox for network selection on explore page

* fix: restore title on non-inline Comboboxes

* fix: use multi-line layout if needed

* fix: select contents on next frame

With DevTools it looks like when you select text right-click menu is triggered automatically.
This happens on all websites, we can prevent it on initial click by delaying it
to next frame, but if you click again it will be triggered anyway.

Not sure if this is worth keeping, it doesn't cause real-world issues AFAIK.

* feat: use gap similar to Dropdown to match

* feat: allow bigger width dropdown with truncate

* feat: resize input to match contents

* fix: do not trigger button click on space

* chore: update no results message

* refactor: use ghost text to resize input

* feat: sort by usage

* fix: only show testnet snapshot networks if metadataNetwork is s-tn
---
 apps/ui/src/components/Combobox.vue           |  82 ++++++++--
 apps/ui/src/components/FormSpaceProfile.vue   |  13 +-
 apps/ui/src/components/Ui/Dropdown.vue        |  13 +-
 apps/ui/src/components/Ui/SelectorNetwork.vue |  17 ++-
 .../composables/useOffchainNetworksList.ts    |  41 +++++
 apps/ui/src/composables/useSpaces.ts          |  11 +-
 apps/ui/src/helpers/constants.ts              |  11 ++
 .../src/networks/common/graphqlApi/index.ts   |   5 +
 apps/ui/src/networks/offchain/api/index.ts    |  29 +++-
 apps/ui/src/networks/offchain/api/queries.ts  |   9 ++
 apps/ui/src/networks/types.ts                 |   3 +
 apps/ui/src/views/My/Explore.vue              | 141 +++++++++++++++++-
 12 files changed, 329 insertions(+), 46 deletions(-)
 create mode 100644 apps/ui/src/composables/useOffchainNetworksList.ts

diff --git a/apps/ui/src/components/Combobox.vue b/apps/ui/src/components/Combobox.vue
index 2f57121c9..28c7e63f8 100644
--- a/apps/ui/src/components/Combobox.vue
+++ b/apps/ui/src/components/Combobox.vue
@@ -7,17 +7,18 @@ import {
   ComboboxOptions
 } from '@headlessui/vue';
 import { Float } from '@headlessui-float/vue';
+import { omit } from '@/helpers/utils';
 import { DefinitionWithOptions } from '@/types';
 
 const NULL_SYMBOL = Symbol('null');
 
-defineOptions({ inheritAttrs: false });
-
 const model = defineModel<T | null>({ required: true });
 
 const props = defineProps<{
   error?: string;
+  inline?: boolean;
   definition: DefinitionWithOptions<T | null>;
+  gap?: number;
 }>();
 
 const dirty = ref(false);
@@ -45,14 +46,21 @@ const inputValue = computed({
   }
 });
 
+const content = computed(() => query.value || getDisplayValue(model.value));
+
 function handleFocus(event: FocusEvent, open: boolean) {
   if (!event.target || open) return;
 
   query.value = '';
-  (event.target as HTMLInputElement).select();
+
+  requestAnimationFrame(() => {
+    (event.target as HTMLInputElement).select();
+  });
 }
 
-function getDisplayValue(value: T) {
+function getDisplayValue(value: T | null) {
+  if (value === null) return '';
+
   const option = props.definition.options.find(option => option.id === value);
   return option ? option.name || String(option.id) : '';
 }
@@ -64,20 +72,38 @@ watch(model, () => {
 
 <template>
   <UiWrapperInput
-    :definition="definition"
+    :definition="inline ? omit(definition, ['title']) : definition"
     :error="error"
     :dirty="dirty"
-    class="relative mb-[14px]"
+    class="relative mb-[14px] w-auto"
   >
     <Combobox v-slot="{ open }" v-model="inputValue" as="div" nullable>
-      <Float adaptive-width strategy="fixed" placement="bottom-end">
-        <div>
-          <ComboboxButton class="w-full">
+      <Float
+        :adaptive-width="inline ? false : true"
+        strategy="fixed"
+        placement="bottom-start"
+        :offset="gap && inline ? gap : 0"
+      >
+        <div
+          :class="{
+            relative: inline
+          }"
+        >
+          <ComboboxButton
+            class="w-full"
+            as="div"
+            :data-value="content"
+            :class="{
+              sizer: inline
+            }"
+          >
             <ComboboxInput
               class="s-input !flex items-center justify-between !mb-0"
               :class="{
-                '!rounded-b-none': open
+                '!rounded-b-none': !gap && open,
+                'h-[42px] min-w-11': inline
               }"
+              :size="'1'"
               autocomplete="off"
               :placeholder="definition.examples?.[0]"
               :display-value="item => getDisplayValue(item as T)"
@@ -86,20 +112,29 @@ watch(model, () => {
               @focus="event => handleFocus(event, open)"
             />
           </ComboboxButton>
-          <ComboboxButton class="absolute right-3 bottom-[14px]">
+          <ComboboxButton v-if="!inline" class="absolute right-3 bottom-[14px]">
             <IH-chevron-up v-if="open" />
             <IH-chevron-down v-else />
           </ComboboxButton>
+          <div
+            v-if="inline"
+            class="absolute top-[-7px] bg-skin-bg px-1 left-2.5 text-sm text-skin-text leading-4"
+          >
+            {{ definition.title }}
+          </div>
         </div>
         <ComboboxOptions
-          class="w-full bg-skin-border rounded-b-lg border-t-skin-text/10 border shadow-xl overflow-hidden"
+          class="w-full bg-skin-border border-t-skin-text/10 border shadow-xl overflow-hidden"
+          :class="
+            inline ? 'max-w-[80vw] sm:max-w-[300px] rounded-lg' : 'rounded-b-lg'
+          "
         >
           <div class="max-h-[208px] overflow-y-auto">
             <div
               v-if="filteredOptions.length === 0 && query !== ''"
-              class="relative cursor-default select-none text-center py-2"
+              class="relative cursor-default select-none text-center py-2 px-3"
             >
-              No result for your search query
+              No results for your search
             </div>
 
             <ComboboxOption
@@ -117,7 +152,7 @@ watch(model, () => {
               >
                 <component :is="item.icon" class="size-[20px] mr-2" />
                 <span
-                  class="w-full py-2 text-skin-link"
+                  class="w-full py-2 text-skin-link truncate"
                   :class="{
                     'opacity-40': disabled,
                     'cursor-pointer': !disabled
@@ -134,3 +169,20 @@ watch(model, () => {
     </Combobox>
   </UiWrapperInput>
 </template>
+
+<style lang="scss" scoped>
+.sizer {
+  @apply inline-grid items-center;
+
+  input {
+    @apply col-start-1 row-start-1;
+  }
+
+  &::after {
+    content: attr(data-value);
+    @apply px-3 border-x col-start-1 row-start-1;
+    visibility: hidden;
+    white-space: pre-wrap;
+  }
+}
+</style>
diff --git a/apps/ui/src/components/FormSpaceProfile.vue b/apps/ui/src/components/FormSpaceProfile.vue
index 77e1eb7ed..0229805d3 100644
--- a/apps/ui/src/components/FormSpaceProfile.vue
+++ b/apps/ui/src/components/FormSpaceProfile.vue
@@ -1,20 +1,9 @@
 <script setup lang="ts">
-import { MAX_SYMBOL_LENGTH } from '@/helpers/constants';
+import { MAX_SYMBOL_LENGTH, SPACE_CATEGORIES } from '@/helpers/constants';
 import { validateForm } from '@/helpers/validation';
 import { offchainNetworks } from '@/networks';
 import { NetworkID } from '@/types';
 
-const SPACE_CATEGORIES = [
-  { id: 'protocol', name: 'Protocol' },
-  { id: 'social', name: 'Social' },
-  { id: 'investment', name: 'Investment' },
-  { id: 'grant', name: 'Grant' },
-  { id: 'service', name: 'Service' },
-  { id: 'media', name: 'Media' },
-  { id: 'creator', name: 'Creator' },
-  { id: 'collector', name: 'Collector' }
-];
-
 const props = defineProps<{
   form: any;
   id?: string;
diff --git a/apps/ui/src/components/Ui/Dropdown.vue b/apps/ui/src/components/Ui/Dropdown.vue
index 49d1c2c3a..312558f9b 100644
--- a/apps/ui/src/components/Ui/Dropdown.vue
+++ b/apps/ui/src/components/Ui/Dropdown.vue
@@ -18,7 +18,12 @@ withDefaults(
 
 <template>
   <Menu as="div" class="relative">
-    <Float :placement="`bottom-${placement}`" :offset="Number(gap)" portal>
+    <Float
+      :placement="`bottom-${placement}`"
+      :offset="Number(gap)"
+      portal
+      z-index="10"
+    >
       <MenuButton :disabled="disabled" as="template" class="cursor-pointer">
         <slot name="button" />
       </MenuButton>
@@ -31,9 +36,11 @@ withDefaults(
         leave-to-class="transform scale-95 opacity-0"
       >
         <MenuItems
-          :class="`rounded-md bg-skin-border text-skin-link shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none`"
+          class="rounded-md bg-skin-border text-skin-link shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none overflow-hidden"
         >
-          <slot name="items" />
+          <div class="max-h-[208px] overflow-y-auto">
+            <slot name="items" />
+          </div>
         </MenuItems>
       </transition>
     </Float>
diff --git a/apps/ui/src/components/Ui/SelectorNetwork.vue b/apps/ui/src/components/Ui/SelectorNetwork.vue
index b11fec7fd..a8f5e540d 100644
--- a/apps/ui/src/components/Ui/SelectorNetwork.vue
+++ b/apps/ui/src/components/Ui/SelectorNetwork.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import networks from '@snapshot-labs/snapshot.js/src/networks.json';
 import { getUrl } from '@/helpers/utils';
 import { enabledNetworks, getNetwork } from '@/networks';
 import { METADATA as STARKNET_NETWORK_METADATA } from '@/networks/starknet';
@@ -16,10 +15,14 @@ const props = defineProps<{
   };
 }>();
 
+const { networks, getUsage } = useOffchainNetworksList(
+  props.definition.networkId
+);
+
 const options = computed(() => {
   if (props.definition.networksListKind === 'full') {
-    const baseNetworks = Object.entries(networks)
-      .filter(([, network]) => {
+    const baseNetworks = networks.value
+      .filter(network => {
         if (
           props.definition.networkId === 's' &&
           'testnet' in network &&
@@ -30,8 +33,8 @@ const options = computed(() => {
 
         return true;
       })
-      .map(([id, network]) => ({
-        id: Number(id),
+      .map(network => ({
+        id: network.chainId,
         name: network.name,
         icon: h('img', {
           src: getUrl(network.logo),
@@ -82,6 +85,10 @@ const options = computed(() => {
     })
     .filter(network => !network.readOnly);
 });
+
+onMounted(() => {
+  getUsage();
+});
 </script>
 
 <template>
diff --git a/apps/ui/src/composables/useOffchainNetworksList.ts b/apps/ui/src/composables/useOffchainNetworksList.ts
new file mode 100644
index 000000000..f186b283d
--- /dev/null
+++ b/apps/ui/src/composables/useOffchainNetworksList.ts
@@ -0,0 +1,41 @@
+import snapshotJsNetworks from '@snapshot-labs/snapshot.js/src/networks.json';
+import { getNetwork } from '@/networks';
+import { ChainId, NetworkID } from '@/types';
+
+const usage = ref<Record<ChainId, number | undefined> | null>(null);
+const loaded = ref(false);
+
+export function useOffchainNetworksList(
+  networkId: NetworkID,
+  hideUnused = false
+) {
+  async function getUsage() {
+    if (loaded.value) return;
+
+    const network = getNetwork(networkId);
+
+    usage.value = await network.api.getNetworksUsage();
+  }
+
+  const networks = computed(() => {
+    const rawNetworks = Object.values(snapshotJsNetworks);
+    const usageValue = usage.value;
+    if (!usageValue) return rawNetworks;
+
+    return [
+      ...(hideUnused
+        ? rawNetworks.filter(network => (usageValue[network.chainId] || 0) > 0)
+        : rawNetworks)
+    ].sort((a, b) => {
+      const aUsage = usageValue[a.chainId] || 0;
+      const bUsage = usageValue[b.chainId] || 0;
+
+      return bUsage - aUsage;
+    });
+  });
+
+  return {
+    getUsage,
+    networks
+  };
+}
diff --git a/apps/ui/src/composables/useSpaces.ts b/apps/ui/src/composables/useSpaces.ts
index 40db14dd4..d8b1dae80 100644
--- a/apps/ui/src/composables/useSpaces.ts
+++ b/apps/ui/src/composables/useSpaces.ts
@@ -98,9 +98,18 @@ export function useSpaces() {
   }
 
   async function _fetchSpaces(overwrite: boolean, filter?: SpacesFilter) {
-    const { networks, limit } = explorePageProtocols[protocol.value];
+    const { limit } = explorePageProtocols[protocol.value];
+    let { networks } = explorePageProtocols[protocol.value];
     let unsortedExplorePageSpaces = overwrite ? [] : explorePageSpaces.value;
 
+    if (
+      protocol.value === 'snapshotx' &&
+      filter?.network &&
+      filter.network !== 'all'
+    ) {
+      networks = [filter.network as NetworkID];
+    }
+
     const results = await Promise.all(
       networks.map(async id => {
         const network = getNetwork(id);
diff --git a/apps/ui/src/helpers/constants.ts b/apps/ui/src/helpers/constants.ts
index 14fb5d4ef..0d643bb39 100644
--- a/apps/ui/src/helpers/constants.ts
+++ b/apps/ui/src/helpers/constants.ts
@@ -36,6 +36,17 @@ export const COINGECKO_BASE_ASSETS = {
 
 export const MAX_SYMBOL_LENGTH = 12;
 
+export const SPACE_CATEGORIES = [
+  { id: 'protocol', name: 'Protocol' },
+  { id: 'social', name: 'Social' },
+  { id: 'investment', name: 'Investment' },
+  { id: 'grant', name: 'Grant' },
+  { id: 'service', name: 'Service' },
+  { id: 'media', name: 'Media' },
+  { id: 'creator', name: 'Creator' },
+  { id: 'collector', name: 'Collector' }
+] as const;
+
 export const BASIC_CHOICES = ['For', 'Against', 'Abstain'];
 export const SUPPORTED_VOTING_TYPES: VoteType[] = [
   'basic',
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index 2feb6c602..e6b346874 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -531,6 +531,8 @@ export function createApi(
         _filter.metadata_ = { name_contains_nocase: _filter.searchQuery };
       }
       delete _filter.searchQuery;
+      delete _filter.category;
+      delete _filter.network;
 
       const { data } = await apollo.query({
         query: SPACES_QUERY,
@@ -678,6 +680,9 @@ export function createApi(
     },
     loadStrategy: async () => {
       return null;
+    },
+    getNetworksUsage: async () => {
+      return {};
     }
   };
 }
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index 22e669d01..399eacf03 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -35,6 +35,7 @@ import {
 import {
   ALIASES_QUERY,
   LEADERBOARD_QUERY,
+  NETWORKS_USAGE_QUERY,
   PROPOSAL_QUERY,
   PROPOSALS_QUERY,
   RANKING_QUERY,
@@ -564,13 +565,25 @@ export function createApi(
       { limit, skip = 0 }: PaginationOpts,
       filter?: SpacesFilter
     ): Promise<Space[]> => {
-      if (!filter || filter.hasOwnProperty('searchQuery')) {
+      if (
+        !filter ||
+        filter.hasOwnProperty('searchQuery') ||
+        filter.hasOwnProperty('category') ||
+        filter.hasOwnProperty('network')
+      ) {
+        const where = {};
+        if (filter?.searchQuery) where['search'] = filter.searchQuery;
+        if (filter?.category) where['category'] = filter.category;
+        if (filter?.network && filter.network !== 'all') {
+          where['network'] = filter.network;
+        }
+
         const { data } = await apollo.query({
           query: RANKING_QUERY,
           variables: {
             first: Math.min(limit, 20),
             skip,
-            where: filter?.searchQuery ? { search: filter.searchQuery } : {}
+            where
           }
         });
         return data.ranking.items.map(space =>
@@ -783,6 +796,18 @@ export function createApi(
       if (!data.strategy) return null;
 
       return formatStrategy(data.strategy as ApiStrategy);
+    },
+    getNetworksUsage: async () => {
+      const { data } = await apollo.query({
+        query: NETWORKS_USAGE_QUERY
+      });
+
+      return Object.fromEntries(
+        data.networks.map((network: any) => [
+          Number(network.id),
+          network.spacesCount
+        ])
+      );
     }
   };
 }
diff --git a/apps/ui/src/networks/offchain/api/queries.ts b/apps/ui/src/networks/offchain/api/queries.ts
index 4b018bb86..0cfef4d05 100644
--- a/apps/ui/src/networks/offchain/api/queries.ts
+++ b/apps/ui/src/networks/offchain/api/queries.ts
@@ -360,3 +360,12 @@ export const STRATEGY_QUERY = gql`
   }
   ${STRATEGY_FRAGMENT}
 `;
+
+export const NETWORKS_USAGE_QUERY = gql`
+  query Networks {
+    networks {
+      id
+      spacesCount
+    }
+  }
+`;
diff --git a/apps/ui/src/networks/types.ts b/apps/ui/src/networks/types.ts
index 78a67475d..3edb74285 100644
--- a/apps/ui/src/networks/types.ts
+++ b/apps/ui/src/networks/types.ts
@@ -26,6 +26,8 @@ export type SpacesFilter = {
   id_in?: string[];
   searchQuery?: string;
   domain?: string;
+  category?: string;
+  network?: string;
 };
 export type ProposalsFilter = {
   state?: 'any' | 'active' | 'pending' | 'closed';
@@ -320,6 +322,7 @@ export type NetworkApi = {
   ): Promise<Statement[]>;
   loadStrategies(): Promise<StrategyTemplate[]>;
   loadStrategy(address: string): Promise<StrategyTemplate | null>;
+  getNetworksUsage(): Promise<Record<ChainId, number | undefined>>;
 };
 
 export type NetworkConstants = {
diff --git a/apps/ui/src/views/My/Explore.vue b/apps/ui/src/views/My/Explore.vue
index 72aca94f9..c0adf678b 100644
--- a/apps/ui/src/views/My/Explore.vue
+++ b/apps/ui/src/views/My/Explore.vue
@@ -1,6 +1,15 @@
 <script setup lang="ts">
-import { explorePageProtocols } from '@/networks';
+import { SPACE_CATEGORIES } from '@/helpers/constants';
+import { getUrl } from '@/helpers/utils';
+import { explorePageProtocols, getNetwork, metadataNetwork } from '@/networks';
 import { ExplorePageProtocol, ProtocolConfig } from '@/networks/types';
+import { SelectItem } from '@/types';
+
+type SpaceCategory = 'all' | (typeof SPACE_CATEGORIES)[number]['id'];
+
+const DEFAULT_PROTOCOL = 'snapshot';
+const DEFAULT_NETWORK = 'all';
+const DEFAULT_CATEGORY = 'all';
 
 const protocols = Object.values(explorePageProtocols).map(
   ({ key, label }: ProtocolConfig) => ({
@@ -8,7 +17,14 @@ const protocols = Object.values(explorePageProtocols).map(
     label
   })
 );
-const DEFAULT_PROTOCOL = 'snapshot';
+
+const categories = [
+  { key: 'all', label: 'All categories' },
+  ...SPACE_CATEGORIES.map(category => ({
+    key: category.id,
+    label: category.name
+  }))
+];
 
 const { setTitle } = useTitle();
 const spacesStore = useSpacesStore();
@@ -16,21 +32,104 @@ const route = useRoute();
 const router = useRouter();
 
 const protocol = ref<ExplorePageProtocol>(DEFAULT_PROTOCOL);
+const network = ref<string>(DEFAULT_NETWORK);
+const category = ref<SpaceCategory>(DEFAULT_CATEGORY);
+
+const { networks: offchainNetworks, getUsage } = useOffchainNetworksList(
+  metadataNetwork,
+  true
+);
+
+const networks = computed(() => {
+  const explorePageNetworks = explorePageProtocols[protocol.value].networks;
+
+  let protocolNetworks: SelectItem<string>[] = [];
+  if (protocol.value === 'snapshot') {
+    protocolNetworks = offchainNetworks.value
+      .filter(network => {
+        if (
+          metadataNetwork === 's' &&
+          'testnet' in network &&
+          network.testnet
+        ) {
+          return false;
+        }
+
+        return true;
+      })
+      .map(network => ({
+        id: network.key,
+        name: network.name,
+        icon: h('img', {
+          src: getUrl(network.logo),
+          alt: network.name,
+          class: 'rounded-full size-3.5'
+        })
+      }));
+  } else {
+    protocolNetworks = explorePageNetworks.map(networkId => {
+      const network = getNetwork(networkId);
+
+      return {
+        id: networkId,
+        name: network.name,
+        icon: h('img', {
+          src: getUrl(network.avatar),
+          alt: network.name,
+          class: 'rounded-full size-3.5'
+        })
+      };
+    });
+  }
 
-watch(protocol, value => {
-  router.push({ query: { ...route.query, p: value } });
+  return [{ id: 'all', name: 'All networks' }, ...protocolNetworks];
+});
+
+function isValidNetwork(network: string): network is string {
+  return network === 'all' || networks.value.some(n => n.id === network);
+}
+
+function isValidCategory(category: string): category is SpaceCategory {
+  return category === 'all' || SPACE_CATEGORIES.some(c => c.id === category);
+}
+
+watch([protocol, category, network], ([p, c, n]) => {
+  const props: { p?: string; c?: string; n?: string } = {
+    ...route.query,
+    p,
+    c,
+    n
+  };
+  if (p !== 'snapshot') delete props.c;
+
+  router.push({ query: props });
 });
 
 watch(
-  [() => route.query.q as string, () => route.query.p as string],
-  ([searchQuery, protocolQuery]) => {
+  [
+    () => route.query.q as string,
+    () => route.query.p as string,
+    () => route.query.c as string,
+    () => route.query.n as string
+  ],
+  ([searchQuery, protocolQuery, categoryQuery, networkQuery]) => {
     const _protocol = (
       explorePageProtocols[protocolQuery] ? protocolQuery : DEFAULT_PROTOCOL
     ) as ExplorePageProtocol;
 
     protocol.value = _protocol;
+    network.value = isValidNetwork(networkQuery)
+      ? networkQuery
+      : DEFAULT_NETWORK;
+    category.value = isValidCategory(categoryQuery)
+      ? categoryQuery
+      : DEFAULT_CATEGORY;
     spacesStore.protocol = _protocol;
-    spacesStore.fetch({ searchQuery });
+    spacesStore.fetch({
+      searchQuery,
+      category: category.value,
+      network: network.value
+    });
   },
   {
     immediate: true
@@ -38,18 +137,44 @@ watch(
 );
 
 watchEffect(() => setTitle('Explore'));
+
+onMounted(() => {
+  getUsage();
+});
 </script>
 
 <template>
   <div class="flex justify-between">
-    <div class="flex flex-row p-4 space-x-2">
+    <div class="flex flex-row flex-wrap p-4 gap-2">
       <UiSelectDropdown
         v-model="protocol"
+        class="min-h-[46px]"
         title="Protocol"
         gap="12"
         placement="start"
         :items="protocols"
       />
+      <Combobox
+        v-model="network"
+        class="mb-0"
+        inline
+        :gap="12"
+        :definition="{
+          type: 'string',
+          title: 'Network',
+          enum: networks.map(c => c.id),
+          options: networks
+        }"
+      />
+      <UiSelectDropdown
+        v-if="protocol === 'snapshot'"
+        v-model="category"
+        class="min-h-[46px]"
+        title="Category"
+        gap="12"
+        placement="start"
+        :items="categories"
+      />
     </div>
   </div>
   <div>

From 2de2cfe524a1c89b297d004994109f05236d61b2 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:18:17 +0800
Subject: [PATCH 38/59] feat: prompt user to agree to space's ToS when required
 (#963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: prompt user to agree to space's ToS when required

* refactor: move terms property to Space main type

* fix: remove duplicate usage

* fix: fix types

* feat: add terms to vote from proposals list

* feat: prompt for tos agreement on proposal creation

* refactor: pluralize module name

* Update apps/ui/src/networks/common/graphqlApi/types.ts

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>

---------

Co-authored-by: Wiktor Tkaczyński <wiktor.tkaczynski@gmail.com>
---
 apps/ui/src/components/Modal/Terms.vue        | 31 +++++++++++++++++++
 apps/ui/src/components/ProposalsListItem.vue  | 27 +++++++++++++++-
 .../src/networks/common/graphqlApi/index.ts   |  3 +-
 apps/ui/src/networks/offchain/api/index.ts    |  3 +-
 apps/ui/src/networks/offchain/api/queries.ts  |  1 +
 apps/ui/src/networks/offchain/api/types.ts    |  1 +
 apps/ui/src/stores/terms.ts                   | 26 ++++++++++++++++
 apps/ui/src/types.ts                          |  1 +
 apps/ui/src/views/Proposal.vue                | 20 ++++++++++++
 apps/ui/src/views/Space/Editor.vue            | 19 ++++++++++++
 10 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 apps/ui/src/components/Modal/Terms.vue
 create mode 100644 apps/ui/src/stores/terms.ts

diff --git a/apps/ui/src/components/Modal/Terms.vue b/apps/ui/src/components/Modal/Terms.vue
new file mode 100644
index 000000000..d913ac979
--- /dev/null
+++ b/apps/ui/src/components/Modal/Terms.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+defineProps<{
+  open: boolean;
+  space: { name: string; terms: string };
+}>();
+
+const emit = defineEmits<{
+  (e: 'close'): void;
+  (e: 'accept'): void;
+}>();
+
+function handleAgreeClick() {
+  emit('close');
+  emit('accept');
+}
+</script>
+
+<template>
+  <UiModal :open="open" @close="$emit('close')">
+    <template #header>
+      <h3 v-text="'Terms of service'" />
+    </template>
+    <div class="p-4">
+      Before continuing, please read and agree to {{ space.name }}
+      <a :href="space.terms" target="_blank">terms of service</a>.
+    </div>
+    <template #footer>
+      <UiButton class="w-full" @click="handleAgreeClick">Agree</UiButton>
+    </template>
+  </UiModal>
+</template>
diff --git a/apps/ui/src/components/ProposalsListItem.vue b/apps/ui/src/components/ProposalsListItem.vue
index cef4dfae4..0a83e3aaa 100644
--- a/apps/ui/src/components/ProposalsListItem.vue
+++ b/apps/ui/src/components/ProposalsListItem.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Choice, Proposal as ProposalType } from '@/types';
 
-defineProps<{
+const props = defineProps<{
   proposal: ProposalType;
   showSpace: boolean;
   showAuthor: boolean;
@@ -9,10 +9,17 @@ defineProps<{
 
 const { modalAccountOpen } = useModal();
 const { web3 } = useWeb3();
+const termsStore = useTermsStore();
 
 const modalOpenVote = ref(false);
+const modalOpenTerms = ref(false);
 const selectedChoice = ref<Choice | null>(null);
 
+const space = computed(() => ({
+  network: props.proposal.network,
+  ...props.proposal.space
+}));
+
 const handleVoteClick = (choice: Choice) => {
   if (!web3.value.account) {
     modalAccountOpen.value = true;
@@ -20,8 +27,19 @@ const handleVoteClick = (choice: Choice) => {
   }
 
   selectedChoice.value = choice;
+
+  if (props.proposal.space.terms && !termsStore.areAccepted(space.value)) {
+    modalOpenTerms.value = true;
+    return;
+  }
+
   modalOpenVote.value = true;
 };
+
+function handleAcceptTerms() {
+  termsStore.accept(space.value);
+  handleVoteClick(selectedChoice.value!);
+}
 </script>
 <template>
   <div>
@@ -65,6 +83,13 @@ const handleVoteClick = (choice: Choice) => {
     </div>
   </div>
   <teleport to="#modal">
+    <ModalTerms
+      v-if="proposal.space.terms"
+      :open="modalOpenTerms"
+      :space="proposal.space"
+      @close="modalOpenTerms = false"
+      @accept="handleAcceptTerms"
+    />
     <ModalVote
       :choice="selectedChoice"
       :proposal="proposal"
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index e6b346874..ea312a219 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -266,7 +266,8 @@ function formatProposal(
       strategies_parsed_metadata: processStrategiesMetadata(
         proposal.space.strategies_parsed_metadata,
         proposal.strategies_indices
-      )
+      ),
+      terms: ''
     },
     metadata_uri: proposal.metadata.id,
     type: 'basic',
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index 399eacf03..4d552a072 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -308,7 +308,8 @@ function formatProposal(proposal: ApiProposal, networkId: NetworkID): Proposal {
       authenticators: [DEFAULT_AUTHENTICATOR],
       executors: [],
       executors_types: [],
-      strategies_parsed_metadata: []
+      strategies_parsed_metadata: [],
+      terms: proposal.space.terms
     },
     execution_strategy_type: executionType,
     has_execution_window_opened: state === 'passed',
diff --git a/apps/ui/src/networks/offchain/api/queries.ts b/apps/ui/src/networks/offchain/api/queries.ts
index 0cfef4d05..1bc683f27 100644
--- a/apps/ui/src/networks/offchain/api/queries.ts
+++ b/apps/ui/src/networks/offchain/api/queries.ts
@@ -116,6 +116,7 @@ const PROPOSAL_FRAGMENT = gql`
       admins
       moderators
       symbol
+      terms
     }
     type
     title
diff --git a/apps/ui/src/networks/offchain/api/types.ts b/apps/ui/src/networks/offchain/api/types.ts
index 2363fe055..75d5ebef0 100644
--- a/apps/ui/src/networks/offchain/api/types.ts
+++ b/apps/ui/src/networks/offchain/api/types.ts
@@ -102,6 +102,7 @@ export type ApiProposal = {
     admins: string[];
     moderators: string[];
     symbol: string;
+    terms: string;
   };
   type: VoteType;
   title: string;
diff --git a/apps/ui/src/stores/terms.ts b/apps/ui/src/stores/terms.ts
new file mode 100644
index 000000000..c418dfeaa
--- /dev/null
+++ b/apps/ui/src/stores/terms.ts
@@ -0,0 +1,26 @@
+import { defineStore } from 'pinia';
+import { NetworkID } from '@/types';
+import pkg from '../../package.json';
+
+type SpaceLikeEntity = { network: NetworkID; id: string };
+
+function getCompositeSpaceId(space: SpaceLikeEntity) {
+  return `${space.network}:${space.id}`;
+}
+
+export const useTermsStore = defineStore('terms', () => {
+  const termsAcceptedIds = useStorage(`${pkg.name}.terms`, [] as string[]);
+
+  function accept(space: SpaceLikeEntity) {
+    termsAcceptedIds.value.push(getCompositeSpaceId(space));
+  }
+
+  function areAccepted(space: SpaceLikeEntity) {
+    return termsAcceptedIds.value.includes(getCompositeSpaceId(space));
+  }
+
+  return {
+    accept,
+    areAccepted
+  };
+});
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index 88cd8c5a7..f87600e73 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -235,6 +235,7 @@ export type Proposal = {
     name: string;
     snapshot_chain_id?: number;
     avatar: string;
+    terms: string;
     controller: string;
     admins?: string[];
     moderators?: string[];
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
index 115e411fa..9aac8c7ad 100644
--- a/apps/ui/src/views/Proposal.vue
+++ b/apps/ui/src/views/Proposal.vue
@@ -18,8 +18,10 @@ const {
 const { setTitle } = useTitle();
 const { web3 } = useWeb3();
 const { modalAccountOpen } = useModal();
+const termsStore = useTermsStore();
 
 const modalOpenVote = ref(false);
+const modalOpenTerms = ref(false);
 const selectedChoice = ref<Choice | null>(null);
 const { votes } = useAccount();
 const editMode = ref(false);
@@ -63,9 +65,20 @@ async function handleVoteClick(choice: Choice) {
   }
 
   selectedChoice.value = choice;
+
+  if (props.space.terms && !termsStore.areAccepted(props.space)) {
+    modalOpenTerms.value = true;
+    return;
+  }
+
   modalOpenVote.value = true;
 }
 
+function handleAcceptTerms() {
+  termsStore.accept(props.space);
+  handleVoteClick(selectedChoice.value!);
+}
+
 async function handleVoteSubmitted() {
   selectedChoice.value = null;
   editMode.value = false;
@@ -345,6 +358,13 @@ watchEffect(() => {
       </Affix>
     </template>
     <teleport to="#modal">
+      <ModalTerms
+        v-if="space.terms"
+        :open="modalOpenTerms"
+        :space="space"
+        @close="modalOpenTerms = false"
+        @accept="handleAcceptTerms"
+      />
       <ModalVote
         v-if="proposal"
         :choice="selectedChoice"
diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
index ce5d84527..227df8fe7 100644
--- a/apps/ui/src/views/Space/Editor.vue
+++ b/apps/ui/src/views/Space/Editor.vue
@@ -49,8 +49,10 @@ const {
 const proposalsStore = useProposalsStore();
 const { votingPower, fetch: fetchVotingPower } = useVotingPower();
 const { strategiesWithTreasuries } = useTreasuries(props.space);
+const termsStore = useTermsStore();
 
 const modalOpen = ref(false);
+const modalOpenTerms = ref(false);
 const previewEnabled = ref(false);
 const sending = ref(false);
 const enforcedVoteType = ref<VoteType | null>(null);
@@ -168,6 +170,11 @@ const proposalLimitReached = computed(
 async function handleProposeClick() {
   if (!proposal.value) return;
 
+  if (props.space.terms && !termsStore.areAccepted(props.space)) {
+    modalOpenTerms.value = true;
+    return;
+  }
+
   sending.value = true;
 
   try {
@@ -236,6 +243,11 @@ async function handleProposeClick() {
   }
 }
 
+function handleAcceptTerms() {
+  termsStore.accept(props.space);
+  handleProposeClick();
+}
+
 function handleExecutionUpdated(
   strategyAddress: string,
   transactions: Transaction[]
@@ -528,6 +540,13 @@ watchEffect(() => {
       </div>
     </div>
     <teleport to="#modal">
+      <ModalTerms
+        v-if="space.terms"
+        :open="modalOpenTerms"
+        :space="space"
+        @close="modalOpenTerms = false"
+        @accept="handleAcceptTerms"
+      />
       <ModalDrafts
         :open="modalOpen"
         :network-id="space.network"

From 4a796b4216d6cdb29e51ffa90d814a7f0d1230c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Mon, 25 Nov 2024 08:22:30 +0100
Subject: [PATCH 39/59] feat: allow any network to be used in Treasuries (#957)

* feat: allow any network to be used in Treasuries

* fix: remove starknet networks from snapshotJS networks

Regression from https://github.com/snapshot-labs/sx-monorepo/pull/944
---
 apps/ui/src/components/EditorExecution.vue    | 16 +++---
 .../ui/src/components/FormSpaceTreasuries.vue |  9 +---
 apps/ui/src/components/Modal/SendToken.vue    |  6 +--
 apps/ui/src/components/Modal/StakeToken.vue   | 11 ++--
 .../src/components/Modal/TreasuryConfig.vue   | 18 ++-----
 apps/ui/src/components/PickerToken.vue        |  7 ++-
 .../components/ProposalExecutionActions.vue   |  6 +--
 .../src/components/ProposalExecutionsList.vue | 44 +++++++--------
 apps/ui/src/components/SpaceTreasury.vue      | 53 ++++++++-----------
 .../src/components/TransactionsListItem.vue   | 24 +++++----
 .../ui/src/composables/useExecutionActions.ts | 16 ++++--
 .../composables/useOffchainNetworksList.ts    |  5 +-
 apps/ui/src/composables/useTreasuries.ts      | 24 ++++-----
 apps/ui/src/composables/useTreasury.ts        | 25 ++-------
 apps/ui/src/helpers/explorer.ts               | 11 +++-
 apps/ui/src/helpers/utils.test.ts             |  4 +-
 apps/ui/src/helpers/utils.ts                  |  2 +-
 .../src/networks/common/graphqlApi/index.ts   | 51 ++++++++++--------
 apps/ui/src/networks/offchain/api/index.ts    |  8 ---
 apps/ui/src/types.ts                          |  6 +--
 20 files changed, 155 insertions(+), 191 deletions(-)

diff --git a/apps/ui/src/components/EditorExecution.vue b/apps/ui/src/components/EditorExecution.vue
index 8b4f7cf67..e5d29b80b 100644
--- a/apps/ui/src/components/EditorExecution.vue
+++ b/apps/ui/src/components/EditorExecution.vue
@@ -116,7 +116,7 @@ watch(
         class="w-full flex justify-between items-center px-4 py-3"
       >
         <UiBadgeNetwork
-          :id="treasury.networkId"
+          :chain-id="treasury.network"
           class="mr-3 shrink-0 size-fit"
           :class="{
             'opacity-40': disabled
@@ -175,7 +175,7 @@ watch(
           </UiTooltip>
         </div>
       </div>
-      <template v-if="model.length > 0 && treasury && treasury.networkId">
+      <template v-if="model.length > 0 && treasury">
         <UiLabel label="Transactions" class="border-t" />
         <div>
           <Draggable
@@ -184,7 +184,7 @@ watch(
             :item-key="() => undefined"
           >
             <template #item="{ element: tx, index: i }">
-              <TransactionsListItem :tx="tx" :network-id="treasury.networkId">
+              <TransactionsListItem :tx="tx" :chain-id="treasury.network">
                 <template #left>
                   <div
                     v-if="model.length > 1"
@@ -247,18 +247,17 @@ watch(
 
     <teleport to="#modal">
       <ModalSendToken
-        v-if="treasury && treasury.networkId"
+        v-if="treasury"
         :open="modalOpen.sendToken"
         :address="treasury.wallet"
         :network="treasury.network"
-        :network-id="treasury.networkId"
         :extra-contacts="extraContacts"
         :initial-state="modalState.sendToken"
         @close="modalOpen.sendToken = false"
         @add="addTx"
       />
       <ModalSendNft
-        v-if="treasury && treasury.networkId"
+        v-if="treasury"
         :open="modalOpen.sendNft"
         :address="treasury.wallet"
         :network="treasury.network"
@@ -268,17 +267,16 @@ watch(
         @add="addTx"
       />
       <ModalStakeToken
-        v-if="treasury && treasury.networkId"
+        v-if="treasury"
         :open="modalOpen.stakeToken"
         :address="treasury.wallet"
         :network="treasury.network"
-        :network-id="treasury.networkId"
         :initial-state="modalState.stakeToken"
         @close="modalOpen.stakeToken = false"
         @add="addTx"
       />
       <ModalTransaction
-        v-if="treasury && treasury.networkId"
+        v-if="treasury"
         :open="modalOpen.contractCall"
         :network="treasury.network"
         :extra-contacts="extraContacts"
diff --git a/apps/ui/src/components/FormSpaceTreasuries.vue b/apps/ui/src/components/FormSpaceTreasuries.vue
index e2531fcc3..64c98d3d4 100644
--- a/apps/ui/src/components/FormSpaceTreasuries.vue
+++ b/apps/ui/src/components/FormSpaceTreasuries.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable';
-import { offchainNetworks } from '@/networks';
 import { NetworkID, SpaceMetadataTreasury } from '@/types';
 
 const model = defineModel<SpaceMetadataTreasury[]>({
   required: true
 });
 
-const props = defineProps<{
+defineProps<{
   networkId: NetworkID;
   limit?: number;
 }>();
@@ -28,11 +27,7 @@ function addTreasuryConfig(config: SpaceMetadataTreasury) {
       : model.value;
 
   const getId = (t: SpaceMetadataTreasury) => {
-    const networkIdentifeir = offchainNetworks.includes(props.networkId)
-      ? t.chainId
-      : t.network;
-
-    return `${t.name}-${networkIdentifeir}-${t.address}`;
+    return `${t.name}-${t.chainId}-${t.address}`;
   };
 
   const existingTreasuries = new Map(
diff --git a/apps/ui/src/components/Modal/SendToken.vue b/apps/ui/src/components/Modal/SendToken.vue
index 939520ee3..77c06936f 100644
--- a/apps/ui/src/components/Modal/SendToken.vue
+++ b/apps/ui/src/components/Modal/SendToken.vue
@@ -6,7 +6,7 @@ import { ETH_CONTRACT } from '@/helpers/constants';
 import { createSendTokenTransaction } from '@/helpers/transactions';
 import { clone } from '@/helpers/utils';
 import { getValidator } from '@/helpers/validation';
-import { ChainId, Contact, NetworkID, Transaction } from '@/types';
+import { ChainId, Contact, Transaction } from '@/types';
 
 const DEFAULT_FORM_STATE = {
   to: '',
@@ -26,7 +26,6 @@ const props = defineProps<{
   open: boolean;
   address: string;
   network: ChainId;
-  networkId: NetworkID;
   extraContacts?: Contact[];
   initialState?: any;
 }>();
@@ -257,7 +256,6 @@ watchEffect(async () => {
         :assets="allAssets"
         :address="address"
         :network="network"
-        :network-id="networkId"
         :loading="loading"
         :search-value="searchValue"
         @pick="
@@ -294,7 +292,7 @@ watchEffect(async () => {
           <div class="flex items-center">
             <UiStamp
               v-if="currentToken"
-              :id="`${networkId}:${currentToken.contractAddress}`"
+              :id="`eip155:${network}:${currentToken.contractAddress}`"
               type="token"
               class="mr-2"
               :size="20"
diff --git a/apps/ui/src/components/Modal/StakeToken.vue b/apps/ui/src/components/Modal/StakeToken.vue
index 942a2fd6e..4dd9a68c8 100644
--- a/apps/ui/src/components/Modal/StakeToken.vue
+++ b/apps/ui/src/components/Modal/StakeToken.vue
@@ -4,14 +4,14 @@ import { ETH_CONTRACT } from '@/helpers/constants';
 import { createStakeTokenTransaction } from '@/helpers/transactions';
 import { clone } from '@/helpers/utils';
 import { getValidator } from '@/helpers/validation';
-import { ChainId, NetworkID, Transaction } from '@/types';
+import { ChainId, Transaction } from '@/types';
 
 const STAKING_CONTRACTS = {
-  eth: {
+  1: {
     address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
     referral: '0x01e8CEC73B020AB9f822fD0dee3Aa4da2fe39e38'
   },
-  sep: {
+  11155111: {
     address: '0x3e3FE7dBc6B4C189E7128855dD526361c49b40Af',
     referral: '0x8C28Cf33d9Fd3D0293f963b1cd27e3FF422B425c'
   }
@@ -43,7 +43,6 @@ const props = defineProps<{
   open: boolean;
   address: string;
   network: ChainId;
-  networkId: NetworkID;
   initialState?: any;
 }>();
 
@@ -88,7 +87,7 @@ const token = computed(() => {
   return token;
 });
 
-const stakingContract = computed(() => STAKING_CONTRACTS[props.networkId]);
+const stakingContract = computed(() => STAKING_CONTRACTS[props.network]);
 
 function handleMaxClick() {
   handleAmountUpdate(
@@ -176,7 +175,7 @@ watch(
           />
           <div class="absolute right-3 top-[28px] flex items-center gap-x-2">
             <UiStamp
-              :id="`${networkId}:${stakingContract.address}`"
+              :id="`eip155:${network}:${stakingContract.address}`"
               type="token"
               :size="20"
             />
diff --git a/apps/ui/src/components/Modal/TreasuryConfig.vue b/apps/ui/src/components/Modal/TreasuryConfig.vue
index cdc171563..2c2951c7f 100644
--- a/apps/ui/src/components/Modal/TreasuryConfig.vue
+++ b/apps/ui/src/components/Modal/TreasuryConfig.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import { clone } from '@/helpers/utils';
 import { validateForm } from '@/helpers/validation';
-import { offchainNetworks } from '@/networks';
 import { NetworkID, SpaceMetadataTreasury } from '@/types';
 
 const DEFAULT_FORM_STATE = {
   name: '',
   address: '',
-  network: null,
   chainId: null
 };
 
@@ -25,16 +23,12 @@ const showPicker = ref(false);
 const searchValue = ref('');
 const form: Ref<SpaceMetadataTreasury> = ref(clone(DEFAULT_FORM_STATE));
 
-const networkField = computed(() =>
-  offchainNetworks.includes(props.networkId) ? 'chainId' : 'network'
-);
-
 const definition = computed(() => {
   return {
     type: 'object',
     title: 'Space',
     additionalProperties: true,
-    required: ['name', 'network', 'address'],
+    required: ['name', 'chainId', 'address'],
     properties: {
       name: {
         type: 'string',
@@ -43,17 +37,15 @@ const definition = computed(() => {
         maxLength: 32,
         examples: ['Treasury name']
       },
-      [networkField.value]: {
+      chainId: {
         type: ['string', 'number', 'null'],
         format: 'network',
         networkId: props.networkId,
-        networksListKind: offchainNetworks.includes(props.networkId)
-          ? 'full'
-          : 'builtin',
+        networksListKind: 'full',
         title: 'Treasury network',
         nullable: true
       },
-      ...(form.value[networkField.value] !== null
+      ...(form.value.chainId !== null
         ? {
             address: {
               type: 'string',
@@ -75,7 +67,7 @@ const formErrors = computed(() =>
 const formValid = computed(() => {
   return (
     Object.keys(formErrors.value).length === 0 &&
-    form.value[networkField.value] !== null &&
+    form.value.chainId !== null &&
     form.value.address !== ''
   );
 });
diff --git a/apps/ui/src/components/PickerToken.vue b/apps/ui/src/components/PickerToken.vue
index 533d8a7dd..264b753aa 100644
--- a/apps/ui/src/components/PickerToken.vue
+++ b/apps/ui/src/components/PickerToken.vue
@@ -7,7 +7,7 @@ import { ETH_CONTRACT } from '@/helpers/constants';
 import Multicaller from '@/helpers/multicaller';
 import { getProvider } from '@/helpers/provider';
 import { _n, shorten } from '@/helpers/utils';
-import { ChainId, NetworkID } from '@/types';
+import { ChainId } from '@/types';
 
 const props = defineProps<{
   searchValue: string;
@@ -15,7 +15,6 @@ const props = defineProps<{
   assets: Token[];
   address: string;
   network: ChainId;
-  networkId: NetworkID;
 }>();
 
 const emit = defineEmits<{
@@ -143,9 +142,9 @@ watch(
       @click="handlePick(asset)"
     >
       <div class="flex items-center min-w-0 pr-2">
-        <UiBadgeNetwork :id="networkId">
+        <UiBadgeNetwork :chain-id="network">
           <UiStamp
-            :id="`${networkId}:${asset.contractAddress}`"
+            :id="`eip155:${network}:${asset.contractAddress}`"
             type="token"
             :size="32"
           />
diff --git a/apps/ui/src/components/ProposalExecutionActions.vue b/apps/ui/src/components/ProposalExecutionActions.vue
index 075b1bb98..3e211d2b1 100644
--- a/apps/ui/src/components/ProposalExecutionActions.vue
+++ b/apps/ui/src/components/ProposalExecutionActions.vue
@@ -16,7 +16,7 @@ const {
   fetchingDetails,
   message,
   executionTx,
-  executionNetwork,
+  executionTxUrl,
   finalizeProposalSending,
   executeProposalSending,
   executeQueuedProposalSending,
@@ -44,9 +44,7 @@ const network = computed(() => getNetwork(props.proposal.network));
       <a
         class="inline-flex items-center"
         target="_blank"
-        :href="
-          executionNetwork.helpers.getExplorerUrl(executionTx, 'transaction')
-        "
+        :href="executionTxUrl || undefined"
       >
         {{ shorten(executionTx) }}
         <IH-arrow-sm-right class="inline-block ml-1 -rotate-45" />
diff --git a/apps/ui/src/components/ProposalExecutionsList.vue b/apps/ui/src/components/ProposalExecutionsList.vue
index b9dbc1a91..e93ba2ad6 100644
--- a/apps/ui/src/components/ProposalExecutionsList.vue
+++ b/apps/ui/src/components/ProposalExecutionsList.vue
@@ -1,32 +1,22 @@
 <script setup lang="ts">
+import { getGenericExplorerUrl } from '@/helpers/explorer';
 import { buildBatchFile } from '@/helpers/safe/ build';
 import { getExecutionName } from '@/helpers/ui';
-import { sanitizeUrl, shorten, toBigIntOrNumber } from '@/helpers/utils';
-import { getNetwork } from '@/networks';
-import { NetworkID, Proposal, ProposalExecution } from '@/types';
+import { shorten, toBigIntOrNumber } from '@/helpers/utils';
+import { Proposal, ProposalExecution } from '@/types';
 
 defineProps<{
   proposal: Proposal;
   executions: ProposalExecution[];
 }>();
 
-function getTreasuryExplorerUrl(networkId: NetworkID, safeAddress: string) {
-  if (!safeAddress) return null;
-
-  try {
-    const network = getNetwork(networkId);
-
-    const url = network.helpers.getExplorerUrl(safeAddress, 'address');
-    return sanitizeUrl(url);
-  } catch (e) {
-    return null;
-  }
-}
-
 function downloadExecution(execution: ProposalExecution) {
   if (!execution.chainId) return;
 
-  const batchFile = buildBatchFile(execution.chainId, execution.transactions);
+  const batchFile = buildBatchFile(
+    execution.chainId as number,
+    execution.transactions
+  );
 
   const blob = new Blob([JSON.stringify(batchFile)], {
     type: 'application/json'
@@ -42,24 +32,28 @@ function downloadExecution(execution: ProposalExecution) {
 <template>
   <div
     v-for="execution in executions"
-    :key="`${execution.networkId}:${execution.safeAddress}`"
+    :key="`${execution.chainId}:${execution.safeAddress}`"
     class="x-block !border-x rounded-lg mb-3 last:mb-0"
   >
     <a
       :href="
-        getTreasuryExplorerUrl(execution.networkId, execution.safeAddress) ||
-        undefined
+        getGenericExplorerUrl(
+          execution.chainId,
+          execution.safeAddress,
+          'address'
+        ) || undefined
       "
       target="_blank"
       class="flex justify-between items-center px-4 py-3"
       :class="{
-        'pointer-events-none': !getTreasuryExplorerUrl(
-          execution.networkId,
-          execution.safeAddress
+        'pointer-events-none': !getGenericExplorerUrl(
+          execution.chainId,
+          execution.safeAddress,
+          'address'
         )
       }"
     >
-      <UiBadgeNetwork :id="execution.networkId" class="mr-3 shrink-0">
+      <UiBadgeNetwork :chain-id="execution.chainId" class="mr-3 shrink-0">
         <UiStamp
           :id="execution.safeAddress"
           type="avatar"
@@ -99,7 +93,7 @@ function downloadExecution(execution: ProposalExecution) {
     <TransactionsListItem
       v-for="(tx, i) in execution.transactions"
       :key="i"
-      :network-id="execution.networkId"
+      :chain-id="execution.chainId"
       :tx="tx"
     />
     <ProposalExecutionActions
diff --git a/apps/ui/src/components/SpaceTreasury.vue b/apps/ui/src/components/SpaceTreasury.vue
index 60c50af92..442e24650 100644
--- a/apps/ui/src/components/SpaceTreasury.vue
+++ b/apps/ui/src/components/SpaceTreasury.vue
@@ -2,10 +2,19 @@
 import { Token } from '@/helpers/alchemy';
 import { ETH_CONTRACT } from '@/helpers/constants';
 import { _c, _n, sanitizeUrl, shorten } from '@/helpers/utils';
-import { evmNetworks } from '@/networks';
-import { Contact, Space, SpaceMetadataTreasury, Transaction } from '@/types';
+import { enabledNetworks, evmNetworks, getNetwork } from '@/networks';
+import {
+  ChainId,
+  Contact,
+  Space,
+  SpaceMetadataTreasury,
+  Transaction
+} from '@/types';
 
-const ETHEREUM_NETWORKS = ['eth', 'sep'];
+const STAKING_CHAIN_IDS: ChainId[] = [1, 11155111];
+const EVM_CHAIN_IDS: ChainId[] = evmNetworks
+  .filter(network => enabledNetworks.includes(network))
+  .map(network => getNetwork(network).chainId);
 
 const props = defineProps<{
   space: Space;
@@ -33,10 +42,6 @@ const modalOpen = ref({
   walletConnectLink: false
 });
 
-const currentNetworkId = computed(() => {
-  return treasury.value?.networkId ?? null;
-});
-
 const spaceKey = computed(() => `${props.space.network}:${props.space.id}`);
 const executionStrategy = computed(
   () =>
@@ -47,7 +52,6 @@ const executionStrategy = computed(
 const isReadOnly = computed(
   () =>
     executionStrategy.value === null ||
-    !currentNetworkId.value ||
     !treasury.value?.supportsTokens ||
     !treasury.value?.supportsNfts
 );
@@ -90,10 +94,9 @@ const treasuryExplorerUrl = computed(() => {
 const hasStakeableAssets = computed(() => {
   return (
     treasury.value &&
-    treasury.value.networkId &&
     !isReadOnly.value &&
     assets.value.some(asset => asset.contractAddress === ETH_CONTRACT) &&
-    ETHEREUM_NETWORKS.includes(treasury.value.networkId)
+    STAKING_CHAIN_IDS.includes(treasury.value.network)
   );
 });
 
@@ -141,11 +144,7 @@ watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
       <div class="flex-auto" />
 
       <UiTooltip
-        v-if="
-          !isReadOnly &&
-          currentNetworkId &&
-          evmNetworks.includes(currentNetworkId)
-        "
+        v-if="!isReadOnly && EVM_CHAIN_IDS.includes(treasury.network)"
         title="Connect to apps"
       >
         <UiButton
@@ -192,11 +191,7 @@ watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
             'pointer-events-none': !treasuryExplorerUrl
           }"
         >
-          <UiBadgeNetwork
-            :id="treasury.networkId"
-            :chain-id="treasury.network"
-            class="mr-3"
-          >
+          <UiBadgeNetwork :chain-id="treasury.network" class="mr-3">
             <UiStamp
               :id="treasury.wallet"
               type="avatar"
@@ -296,12 +291,9 @@ watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
             class="mx-4 py-3 border-b flex"
           >
             <div class="flex-auto flex items-center min-w-0 space-x-3">
-              <UiBadgeNetwork
-                :id="treasury.networkId"
-                :chain-id="treasury.network"
-              >
+              <UiBadgeNetwork :chain-id="treasury.network">
                 <UiStamp
-                  :id="`${treasury.networkId}:${asset.contractAddress}`"
+                  :id="`eip155:${treasury.network}:${asset.contractAddress}`"
                   type="token"
                   :size="32"
                 />
@@ -409,17 +401,15 @@ watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
     </div>
     <teleport to="#modal">
       <ModalSendToken
-        v-if="!isReadOnly && currentNetworkId && treasury.supportsTokens"
+        v-if="!isReadOnly && treasury.supportsTokens"
         :open="modalOpen.tokens"
         :address="treasury.wallet"
         :network="treasury.network"
-        :network-id="currentNetworkId"
         :extra-contacts="extraContacts"
         @close="modalOpen.tokens = false"
         @add="addTx"
       />
       <ModalSendNft
-        v-if="currentNetworkId"
         :open="modalOpen.nfts"
         :address="treasury.wallet"
         :network="treasury.network"
@@ -428,20 +418,19 @@ watchEffect(() => setTitle(`Treasury - ${props.space.name}`));
         @add="addTx"
       />
       <ModalStakeToken
-        v-if="hasStakeableAssets && currentNetworkId"
+        v-if="hasStakeableAssets"
         :open="modalOpen.stake"
         :address="treasury.wallet"
         :network="treasury.network"
-        :network-id="currentNetworkId"
         @close="modalOpen.stake = false"
         @add="addTx"
       />
       <ModalLinkWalletConnect
-        v-if="executionStrategy && currentNetworkId"
+        v-if="executionStrategy"
         :open="modalOpen.walletConnectLink"
         :address="treasury.wallet"
         :network="treasury.network"
-        :network-id="currentNetworkId"
+        :network-id="space.network"
         :space-key="spaceKey"
         :execution-strategy="executionStrategy"
         @close="modalOpen.walletConnectLink = false"
diff --git a/apps/ui/src/components/TransactionsListItem.vue b/apps/ui/src/components/TransactionsListItem.vue
index bc2abd9c5..d226ceb8b 100644
--- a/apps/ui/src/components/TransactionsListItem.vue
+++ b/apps/ui/src/components/TransactionsListItem.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
 import { formatUnits } from '@ethersproject/units';
+import { getGenericExplorerUrl } from '@/helpers/explorer';
 import { getNames } from '@/helpers/stamp';
 import { _n, shorten } from '@/helpers/utils';
-import { getNetwork } from '@/networks';
-import { NetworkID, Transaction } from '@/types';
+import { ChainId, Transaction } from '@/types';
 
-const props = defineProps<{ networkId: NetworkID; tx: Transaction }>();
+const props = defineProps<{ chainId: ChainId; tx: Transaction }>();
 
 const expanded = ref(false);
 
-const network = computed(() => {
-  return getNetwork(props.networkId);
-});
-
 const title = computed(() => {
   if (props.tx._type === 'sendToken') {
     return `Send <b>${_n(formatUnits(props.tx._form.amount, props.tx._form.token.decimals), 'standard', { formatDust: true })}</b> ${
@@ -183,7 +179,9 @@ const parsedTitle = computedAsync(
         <a
           class="inline-flex items-center"
           target="_blank"
-          :href="network.helpers.getExplorerUrl(call.to, 'address')"
+          :href="
+            getGenericExplorerUrl(chainId, call.to, 'address') || undefined
+          "
         >
           {{ shorten(call.to) }}
           <IH-arrow-sm-right class="inline-block ml-1 -rotate-45" />
@@ -194,7 +192,10 @@ const parsedTitle = computedAsync(
         <a
           class="inline-flex items-center"
           target="_blank"
-          :href="network.helpers.getExplorerUrl(interaction.to, 'address')"
+          :href="
+            getGenericExplorerUrl(chainId, interaction.to, 'address') ||
+            undefined
+          "
         >
           {{ shorten(interaction.to) }}
           <IH-arrow-sm-right class="inline-block ml-1 -rotate-45" />
@@ -208,7 +209,10 @@ const parsedTitle = computedAsync(
             v-if="param.type === 'address'"
             class="inline-flex items-center"
             target="_blank"
-            :href="network.helpers.getExplorerUrl(param.value, 'address')"
+            :href="
+              getGenericExplorerUrl(chainId, param.value, 'address') ||
+              undefined
+            "
           >
             {{ shorten(param.value) }}
             <IH-arrow-sm-right class="inline-block ml-1 -rotate-45" />
diff --git a/apps/ui/src/composables/useExecutionActions.ts b/apps/ui/src/composables/useExecutionActions.ts
index 46a89a2af..572e5ac63 100644
--- a/apps/ui/src/composables/useExecutionActions.ts
+++ b/apps/ui/src/composables/useExecutionActions.ts
@@ -4,6 +4,7 @@ import {
   InMemoryCache
 } from '@apollo/client/core';
 import gql from 'graphql-tag';
+import { getGenericExplorerUrl } from '@/helpers/explorer';
 import {
   getModuleAddressForTreasury,
   getOgProposalGql,
@@ -74,6 +75,16 @@ export function useExecutionActions(
     return Math.max(proposal.execution_time * 1000 - currentTimestamp.value, 0);
   });
 
+  const executionTxUrl = computed(() => {
+    if (!executionTx.value) return null;
+
+    return getGenericExplorerUrl(
+      execution.chainId,
+      executionTx.value,
+      'transaction'
+    );
+  });
+
   async function fetchEthRelayerExecutionDetails() {
     if (currentTimestamp.value < proposal.max_end * 1000) {
       message.value =
@@ -121,7 +132,7 @@ export function useExecutionActions(
 
   async function fetchOSnapExecutionDetails() {
     try {
-      if (!execution.chainId) {
+      if (!execution.chainId || typeof execution.chainId !== 'number') {
         throw new Error('Chain ID is required for oSnap execution');
       }
 
@@ -151,7 +162,6 @@ export function useExecutionActions(
           : 'Space is not configured for automatic execution.';
       } else if (data.executionTransactionHash) {
         try {
-          executionNetwork.value = getNetwork(execution.networkId);
           executionTx.value = data.executionTransactionHash;
         } catch (e) {
           message.value =
@@ -230,7 +240,7 @@ export function useExecutionActions(
     fetchingDetails,
     message,
     executionTx,
-    executionNetwork,
+    executionTxUrl,
     finalizeProposalSending,
     executeProposalSending,
     executeQueuedProposalSending,
diff --git a/apps/ui/src/composables/useOffchainNetworksList.ts b/apps/ui/src/composables/useOffchainNetworksList.ts
index f186b283d..96f9ca697 100644
--- a/apps/ui/src/composables/useOffchainNetworksList.ts
+++ b/apps/ui/src/composables/useOffchainNetworksList.ts
@@ -18,7 +18,10 @@ export function useOffchainNetworksList(
   }
 
   const networks = computed(() => {
-    const rawNetworks = Object.values(snapshotJsNetworks);
+    const rawNetworks = Object.values(snapshotJsNetworks).filter(
+      ({ chainId }) => typeof chainId === 'number'
+    );
+
     const usageValue = usage.value;
     if (!usageValue) return rawNetworks;
 
diff --git a/apps/ui/src/composables/useTreasuries.ts b/apps/ui/src/composables/useTreasuries.ts
index bddc781c8..810afd066 100644
--- a/apps/ui/src/composables/useTreasuries.ts
+++ b/apps/ui/src/composables/useTreasuries.ts
@@ -1,5 +1,4 @@
 import { SUPPORTED_CHAIN_IDS as ALCHEMY_SUPPORTED_CHAIN_IDS } from '@/helpers/alchemy';
-import { CHAIN_IDS } from '@/helpers/constants';
 import { SUPPORTED_CHAIN_IDS as OPENSEA_SUPPORTED_CHAIN_IDS } from '@/helpers/opensea';
 import { getIsOsnapEnabled } from '@/helpers/osnap';
 import { compareAddresses } from '@/helpers/utils';
@@ -21,18 +20,18 @@ export function useTreasuries(spaceRef: ComputedRef<InputType> | InputType) {
     if (offchainNetworks.includes(space.network)) {
       oSnapSupportPerTreasury = await Promise.all(
         space.treasuries.map(async treasury => {
-          if (
-            !treasury.network ||
-            !treasury.address ||
-            !CHAIN_IDS[treasury.network]
-          ) {
+          if (!treasury.address || !treasury.chainId) {
             return false;
           }
 
-          return getIsOsnapEnabled(
-            CHAIN_IDS[treasury.network] as number,
-            treasury.address
-          );
+          try {
+            return await getIsOsnapEnabled(
+              treasury.chainId as number,
+              treasury.address
+            );
+          } catch (e) {
+            return false;
+          }
         })
       );
     }
@@ -57,9 +56,8 @@ export function useTreasuries(spaceRef: ComputedRef<InputType> | InputType) {
             strategy.treasury &&
             strategy.treasury_chain &&
             treasury.address &&
-            treasury.network &&
             compareAddresses(strategy.treasury, treasury.address) &&
-            CHAIN_IDS[treasury.network] === strategy.treasury_chain
+            treasury.chainId === strategy.treasury_chain
           );
         });
 
@@ -83,7 +81,6 @@ export function useTreasuries(spaceRef: ComputedRef<InputType> | InputType) {
         // Editor will only show strategies that are:
         // - Supported by the Alchemy API
         // - Supported by the OpenSea API
-        // - Have network
         // in the future we can make it more granular
         if (strategy.treasury.chainId) {
           if (
@@ -105,7 +102,6 @@ export function useTreasuries(spaceRef: ComputedRef<InputType> | InputType) {
 
         return (
           strategy &&
-          strategy.treasury.network &&
           getNetwork(space.network).helpers.isExecutorSupported(strategy.type)
         );
       }) as StrategyWithTreasury[];
diff --git a/apps/ui/src/composables/useTreasury.ts b/apps/ui/src/composables/useTreasury.ts
index a7696bba1..592505680 100644
--- a/apps/ui/src/composables/useTreasury.ts
+++ b/apps/ui/src/composables/useTreasury.ts
@@ -1,48 +1,31 @@
 import { sanitizeUrl } from '@braintree/sanitize-url';
 import { SUPPORTED_CHAIN_IDS as TOKENS_SUPPORTED_CHAIN_IDS } from '@/helpers/alchemy';
-import { CHAIN_IDS } from '@/helpers/constants';
 import { getGenericExplorerUrl } from '@/helpers/explorer';
 import { SUPPORTED_CHAIN_IDS as NFTS_SUPPORTED_CHAIN_IDS } from '@/helpers/opensea';
-import { getNetwork } from '@/networks';
 import { SpaceMetadataTreasury } from '@/types';
 
 export function useTreasury(treasuryData: SpaceMetadataTreasury) {
   const treasury = computed(() => {
     if (!treasuryData) return null;
 
-    const networkId = treasuryData.network;
+    const { chainId, address, name } = treasuryData;
 
-    const chainId =
-      treasuryData.chainId ?? (networkId ? CHAIN_IDS[networkId] : null);
     if (!chainId) return null;
 
     return {
-      networkId,
       network: chainId,
-      wallet: treasuryData.address,
-      name: treasuryData.name,
+      wallet: address,
+      name,
       supportsTokens: TOKENS_SUPPORTED_CHAIN_IDS.includes(chainId as any),
       supportsNfts: NFTS_SUPPORTED_CHAIN_IDS.includes(chainId as any)
     };
   });
 
-  const currentNetwork = computed(() => {
-    if (!treasury.value?.networkId) return null;
-
-    try {
-      return getNetwork(treasury.value.networkId);
-    } catch (e) {
-      return null;
-    }
-  });
-
   function getExplorerUrl(address: string, type: 'address' | 'token') {
     if (!treasury.value) return null;
 
     let url: string | null = null;
-    if (currentNetwork.value) {
-      url = currentNetwork.value.helpers.getExplorerUrl(address, type);
-    } else if (treasury.value.network) {
+    if (treasury.value.network) {
       url = getGenericExplorerUrl(treasury.value.network, address, type);
     }
 
diff --git a/apps/ui/src/helpers/explorer.ts b/apps/ui/src/helpers/explorer.ts
index 61457c28f..da68a07b0 100644
--- a/apps/ui/src/helpers/explorer.ts
+++ b/apps/ui/src/helpers/explorer.ts
@@ -9,10 +9,17 @@ import { ChainId, NetworkID } from '@/types';
 export function getGenericExplorerUrl(
   chainId: ChainId,
   address: string,
-  type: 'address' | 'token'
+  type: 'address' | 'token' | 'transaction'
 ) {
   if (typeof chainId === 'number') {
-    return `${networks[chainId].explorer.url}/${type}/${address}`;
+    let mappedType = 'tx';
+    if (type === 'address') {
+      mappedType = 'address';
+    } else if (type === 'token') {
+      mappedType = 'token';
+    }
+
+    return `${networks[chainId].explorer.url}/${mappedType}/${address}`;
   }
 
   const starknetNetwork = Object.entries(STARKNET_NETWORKS_METADATA).find(
diff --git a/apps/ui/src/helpers/utils.test.ts b/apps/ui/src/helpers/utils.test.ts
index 94eea47b0..126367bd9 100644
--- a/apps/ui/src/helpers/utils.test.ts
+++ b/apps/ui/src/helpers/utils.test.ts
@@ -68,7 +68,7 @@ describe('utils', () => {
         treasuries: [
           {
             name: 'treasury 1',
-            network: 'sep',
+            chainId: 11155111,
             address: '0x000000000000000000000000000000000000dead'
           }
         ],
@@ -106,7 +106,7 @@ describe('utils', () => {
           treasuries: [
             {
               name: 'treasury 1',
-              network: 'sep',
+              chain_id: 11155111,
               address: '0x000000000000000000000000000000000000dead'
             }
           ],
diff --git a/apps/ui/src/helpers/utils.ts b/apps/ui/src/helpers/utils.ts
index eab925ff5..0071df4bb 100644
--- a/apps/ui/src/helpers/utils.ts
+++ b/apps/ui/src/helpers/utils.ts
@@ -444,7 +444,7 @@ export function createErc1155Metadata(
       discord: metadata.discord,
       treasuries: metadata.treasuries.map(treasury => ({
         name: treasury.name,
-        network: treasury.network,
+        chain_id: treasury.chainId,
         address: treasury.address
       })),
       labels: metadata.labels?.map(label => ({
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index ea312a219..e9a0bd8cb 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -6,6 +6,7 @@ import {
 import { CHAIN_IDS } from '@/helpers/constants';
 import { getNames } from '@/helpers/stamp';
 import { clone, compareAddresses } from '@/helpers/utils';
+import { getNetwork } from '@/networks';
 import {
   NetworkApi,
   NetworkConstants,
@@ -20,6 +21,7 @@ import {
   ProposalExecution,
   ProposalState,
   Space,
+  SpaceMetadataTreasury,
   Transaction,
   User,
   UserActivity,
@@ -89,6 +91,25 @@ function formatExecution(execution: string): Transaction[] {
   }
 }
 
+function formatMetadataTreasury(treasury: string): SpaceMetadataTreasury {
+  const { name, network, chain_id, address } = JSON.parse(treasury);
+
+  if (network) {
+    // NOTE: Legacy format
+    return {
+      name,
+      address,
+      chainId: CHAIN_IDS[network]
+    };
+  }
+
+  return {
+    name,
+    address,
+    chainId: chain_id
+  };
+}
+
 function processStrategiesMetadata(
   parsedMetadata: ApiStrategyParsedMetadata[],
   strategiesIndicies?: number[]
@@ -135,15 +156,9 @@ function processExecutions(
     strategy => strategy.address === proposal.execution_strategy
   );
 
-  const treasuries = proposal.space.metadata.treasuries.map(treasury => {
-    const { name, network, address } = JSON.parse(treasury);
-
-    return {
-      name,
-      network,
-      address
-    };
-  });
+  const treasuries = proposal.space.metadata.treasuries.map(treasury =>
+    formatMetadataTreasury(treasury)
+  );
 
   const matchingTreasury = treasuries.find(treasury => {
     if (!match) return null;
@@ -151,7 +166,7 @@ function processExecutions(
     return (
       match.treasury &&
       compareAddresses(treasury.address, match.treasury) &&
-      match.treasury_chain === CHAIN_IDS[treasury.network]
+      match.treasury_chain === treasury.chainId
     );
   });
 
@@ -160,7 +175,8 @@ function processExecutions(
       strategyType: match?.type || '',
       safeAddress: match?.treasury || '',
       safeName: matchingTreasury?.name || 'Unnamed treasury',
-      networkId: matchingTreasury?.network || executionNetworkId,
+      chainId:
+        matchingTreasury?.chainId || getNetwork(executionNetworkId).chainId,
       transactions
     }
   ];
@@ -185,16 +201,9 @@ function formatSpace(
     terms: '',
     voting_power_symbol: space.metadata.voting_power_symbol,
     voting_types: constants.EDITOR_VOTING_TYPES,
-    treasuries: space.metadata.treasuries.map(treasury => {
-      const { name, network, address } = JSON.parse(treasury);
-
-      return {
-        name,
-        network,
-        address,
-        chainId: CHAIN_IDS[network]
-      };
-    }),
+    treasuries: space.metadata.treasuries.map(treasury =>
+      formatMetadataTreasury(treasury)
+    ),
     labels: space.metadata.labels.map(label => {
       const { id, name, description, color } = JSON.parse(label);
       return { id, name, description, color };
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index 4d552a072..f7593d2bb 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -60,13 +60,6 @@ import { DEFAULT_VOTING_DELAY } from '../constants';
 
 const DEFAULT_AUTHENTICATOR = 'OffchainAuthenticator';
 
-const TREASURY_NETWORKS = new Map(
-  Object.entries(CHAIN_IDS).map(([networkId, chainId]) => [
-    chainId,
-    networkId as keyof typeof CHAIN_IDS
-  ])
-);
-
 const DELEGATION_STRATEGIES = [
   'delegation',
   'erc20-balance-of-delegation',
@@ -101,7 +94,6 @@ function formatSpace(
 
     return {
       name: treasury.name,
-      network: TREASURY_NETWORKS.get(chainId) ?? null,
       address: treasury.address,
       chainId
     };
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index f87600e73..6f0ca6131 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -61,9 +61,8 @@ export type SelectedStrategy = {
 
 export type SpaceMetadataTreasury = {
   name: string;
-  network: Exclude<NetworkID, 's' | 's-tn'> | null;
   address: string;
-  chainId?: ChainId | null;
+  chainId: ChainId | null;
 };
 
 export type SpaceMetadataLabel = {
@@ -217,9 +216,8 @@ export type ProposalExecution = {
   strategyType: string;
   safeName: string;
   safeAddress: string;
-  networkId: NetworkID;
   transactions: Transaction[];
-  chainId?: number;
+  chainId: ChainId;
 };
 
 export type Proposal = {

From 31aa2858aedb8b9e6c5f6b1b148e97222a606d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Tue, 26 Nov 2024 15:12:58 +0100
Subject: [PATCH 40/59] chore: remove reset for sx-api (#991)

---
 apps/api/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index 170f04eac..d1bbf2655 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -65,7 +65,7 @@ async function run() {
     await sleep(PRODUCTION_INDEXER_DELAY);
   }
 
-  await checkpoint.reset();
+  // await checkpoint.reset();
   checkpoint.start();
 }
 

From 1caf19d298e0330ade5f7e5620350a8dd41d6108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Tue, 26 Nov 2024 22:40:12 +0100
Subject: [PATCH 41/59] chore: upgrade node to v22 (#993)

* chore: upgrade node to v22

* chore: dummy commit to trigger redeploy
---
 .github/workflows/release.yml | 4 ++--
 .github/workflows/test.yml    | 4 ++--
 package.json                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a716d0b4d..f02164aa9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
-      - name: Setup Node.js 16
+      - name: Setup Node.js 22
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22
       - name: Install Dependencies
         run: yarn
       - name: Create Release Pull Request or Publish to npm
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 03de30e4c..e5435a12c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Setup Node.js
+      - name: Setup Node.js 22
         uses: actions/setup-node@v2
         with:
-          node-version: "18.x"
+          node-version: 22
           cache: "yarn"
       - name: Setup Rust Toolchain
         uses: dtolnay/rust-toolchain@stable
diff --git a/package.json b/package.json
index b8342792e..97b539854 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "turbo": "^1.12.3"
   },
   "engines": {
-    "node": ">=18.x"
+    "node": ">=22.x"
   },
   "packageManager": "yarn@1.22.19",
   "workspaces": {

From 7e509234c54d3d1bbc1d0fa25d27328f599e72a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Tue, 26 Nov 2024 22:41:02 +0100
Subject: [PATCH 42/59] fix: copy minScore from filters to params (#995)

---
 apps/ui/src/composables/useSpaceSettings.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/ui/src/composables/useSpaceSettings.ts b/apps/ui/src/composables/useSpaceSettings.ts
index 7328a8fe5..513b6118a 100644
--- a/apps/ui/src/composables/useSpaceSettings.ts
+++ b/apps/ui/src/composables/useSpaceSettings.ts
@@ -442,6 +442,12 @@ export function useSpaceSettings(space: Ref<Space>) {
     if (space.additionalRawData?.filters.onlyMembers) {
       validation.name = 'only-members';
       validation.params = {};
+    } else if (
+      space.additionalRawData?.filters.minScore &&
+      validation.name === 'basic' &&
+      !validation.params.minScore
+    ) {
+      validation.params.minScore = space.additionalRawData.filters.minScore;
     } else if (validation.name === 'any') {
       validation.name = 'basic';
       validation.params = {

From 1a0efa28dfcd1a51f48ff6f62cedc66639f1a97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Tue, 26 Nov 2024 22:42:28 +0100
Subject: [PATCH 43/59] chore: rename avatar input to safe (#992)

* chore: rename avatar input to safe

This way it's clearer for users.

* chore: update avatar execution description
---
 apps/ui/src/networks/evm/constants.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/networks/evm/constants.ts b/apps/ui/src/networks/evm/constants.ts
index 146096af1..53011a74d 100644
--- a/apps/ui/src/networks/evm/constants.ts
+++ b/apps/ui/src/networks/evm/constants.ts
@@ -425,7 +425,7 @@ export function createConstants(networkId: NetworkID) {
       type: 'SimpleQuorumAvatar',
       name: EXECUTORS.SimpleQuorumAvatar,
       about:
-        'An execution strategy that allows proposals to execute transactions from a specified target Avatar contract, the most popular one being a Safe.',
+        'An execution strategy that allows proposals to execute transactions from a specified target Safe contract.',
       icon: IHUserCircle,
       generateSummary: (params: Record<string, any>) =>
         `(${params.quorum}, ${shorten(params.contractAddress)})`,
@@ -466,7 +466,7 @@ export function createConstants(networkId: NetworkID) {
           contractAddress: {
             type: 'string',
             format: 'address',
-            title: 'Avatar address',
+            title: 'Safe address',
             examples: ['0x0000…']
           }
         }

From 6597ff682db9620b7980441a2d21d89f257027cb Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 27 Nov 2024 17:20:37 +0800
Subject: [PATCH 44/59] feat: add labels filter to proposals list (#990)

---
 apps/ui/src/components/EditorLabels.vue       |   6 +-
 apps/ui/src/components/PickerLabel.vue        |  17 ++-
 .../src/networks/common/graphqlApi/index.ts   |  13 ++-
 apps/ui/src/networks/offchain/api/index.ts    |   8 +-
 apps/ui/src/networks/types.ts                 |   1 +
 apps/ui/src/stores/proposals.ts               |   4 +-
 apps/ui/src/views/Space/Proposals.vue         | 102 ++++++++++++++++--
 7 files changed, 130 insertions(+), 21 deletions(-)

diff --git a/apps/ui/src/components/EditorLabels.vue b/apps/ui/src/components/EditorLabels.vue
index ef3ff4934..1f1a684d7 100644
--- a/apps/ui/src/components/EditorLabels.vue
+++ b/apps/ui/src/components/EditorLabels.vue
@@ -12,7 +12,11 @@ const labels = defineModel<string[]>({
 
 <template>
   <div v-if="space.labels?.length">
-    <PickerLabel v-model="labels" :labels="space.labels">
+    <PickerLabel
+      v-model="labels"
+      :labels="space.labels"
+      :button-props="{ class: 'outline-none focus-within:text-skin-link' }"
+    >
       <template #button>
         <div class="flex justify-between items-center mb-2.5">
           <h4 class="eyebrow" v-text="'Labels'" />
diff --git a/apps/ui/src/components/PickerLabel.vue b/apps/ui/src/components/PickerLabel.vue
index 71ae7d88d..be6954530 100644
--- a/apps/ui/src/components/PickerLabel.vue
+++ b/apps/ui/src/components/PickerLabel.vue
@@ -12,6 +12,12 @@ import { SpaceMetadataLabel } from '@/types';
 
 const props = defineProps<{
   labels: SpaceMetadataLabel[];
+  buttonProps?: Record<string, any>;
+  panelProps?: Record<string, any>;
+}>();
+
+defineSlots<{
+  button(props: { close: () => void }): any;
 }>();
 
 const selectedLabels = defineModel<string[]>({
@@ -32,16 +38,16 @@ const filteredLabels = computed(() =>
 </script>
 
 <template>
-  <Popover v-slot="{ open }" class="relative contents">
+  <Popover v-slot="{ open, close }" class="relative contents">
     <PopoverButton
-      class="outline-none focus-within:text-skin-link w-full"
+      class="w-full"
       :class="open ? 'text-skin-link' : 'text-skin-text'"
+      v-bind="buttonProps"
     >
-      <slot name="button">
+      <slot name="button" :close="close">
         <IH-pencil />
       </slot>
     </PopoverButton>
-
     <transition
       enter-active-class="transition duration-200 ease-out"
       enter-from-class="translate-y-1 opacity-0"
@@ -52,8 +58,9 @@ const filteredLabels = computed(() =>
     >
       <PopoverPanel
         focus
-        class="absolute z-10 left-0 -mt-2 mx-4 pb-3"
+        class="absolute z-[11] left-0 -mt-2 mx-4 pb-3"
         style="width: calc(100% - 48px)"
+        v-bind="panelProps"
       >
         <Combobox
           v-slot="{ activeOption }"
diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index e9a0bd8cb..dcece27cd 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -451,7 +451,10 @@ export function createApi(
       filters?: ProposalsFilter,
       searchQuery = ''
     ): Promise<Proposal[]> => {
-      const _filters: Record<string, any> = clone(filters || {});
+      const _filters: ProposalsFilter = clone(filters || {});
+      const metadataFilters: Record<string, any> = {
+        title_contains_nocase: searchQuery
+      };
       const state = _filters.state;
 
       if (state === 'active') {
@@ -465,6 +468,12 @@ export function createApi(
 
       delete _filters.state;
 
+      if (_filters.labels?.length) {
+        metadataFilters.labels_contains = _filters.labels;
+      }
+
+      delete _filters.labels;
+
       const { data } = await apollo.query({
         query: PROPOSALS_QUERY,
         variables: {
@@ -473,7 +482,7 @@ export function createApi(
           where: {
             space_in: spaceIds,
             cancelled: false,
-            metadata_: { title_contains_nocase: searchQuery },
+            metadata_: metadataFilters,
             ..._filters
           }
         }
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index f7593d2bb..d90c3288e 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -496,7 +496,7 @@ export function createApi(
       filters?: ProposalsFilter,
       searchQuery = ''
     ): Promise<Proposal[]> => {
-      const _filters: Record<string, any> = clone(filters || {});
+      const _filters: ProposalsFilter = clone(filters || {});
       const state = _filters.state;
 
       if (state === 'active') {
@@ -517,6 +517,12 @@ export function createApi(
 
       delete _filters.state;
 
+      if (_filters.labels?.length) {
+        _filters.labels_in = _filters.labels;
+      }
+
+      delete _filters.labels;
+
       const { data } = await apollo.query({
         query: PROPOSALS_QUERY,
         variables: {
diff --git a/apps/ui/src/networks/types.ts b/apps/ui/src/networks/types.ts
index 3edb74285..fb4018a86 100644
--- a/apps/ui/src/networks/types.ts
+++ b/apps/ui/src/networks/types.ts
@@ -31,6 +31,7 @@ export type SpacesFilter = {
 };
 export type ProposalsFilter = {
   state?: 'any' | 'active' | 'pending' | 'closed';
+  labels?: string[];
 } & Record<string, any>;
 export type Connector =
   | 'argentx'
diff --git a/apps/ui/src/stores/proposals.ts b/apps/ui/src/stores/proposals.ts
index 602f2ba2d..d9bc30a1f 100644
--- a/apps/ui/src/stores/proposals.ts
+++ b/apps/ui/src/stores/proposals.ts
@@ -64,7 +64,7 @@ export const useProposalsStore = defineStore('proposals', () => {
   async function fetch(
     spaceId: string,
     networkId: NetworkID,
-    state?: ProposalsFilter['state']
+    filters?: ProposalsFilter
   ) {
     await metaStore.fetchBlock(networkId);
 
@@ -96,7 +96,7 @@ export const useProposalsStore = defineStore('proposals', () => {
           limit: PROPOSALS_LIMIT
         },
         metaStore.getCurrent(networkId) || 0,
-        { state }
+        filters
       )
     );
 
diff --git a/apps/ui/src/views/Space/Proposals.vue b/apps/ui/src/views/Space/Proposals.vue
index 96c01da5a..19f37322d 100644
--- a/apps/ui/src/views/Space/Proposals.vue
+++ b/apps/ui/src/views/Space/Proposals.vue
@@ -18,6 +18,7 @@ const route = useRoute();
 const proposalsStore = useProposalsStore();
 
 const state = ref<NonNullable<ProposalsFilter['state']>>('any');
+const labels = ref<string[]>([]);
 
 const selectIconBaseProps = {
   size: 16
@@ -27,6 +28,17 @@ const proposalsRecord = computed(
   () => proposalsStore.proposals[`${props.space.network}:${props.space.id}`]
 );
 
+const spaceLabels = computed(() => {
+  if (!props.space.labels) return {};
+
+  return Object.fromEntries(props.space.labels.map(label => [label.id, label]));
+});
+
+function handleClearLabelsFilter(close: () => void) {
+  labels.value = [];
+  close();
+}
+
 async function handleEndReached() {
   if (!proposalsRecord.value?.hasMoreProposals) return;
 
@@ -37,25 +49,42 @@ function handleFetchVotingPower() {
   fetchVotingPower(props.space);
 }
 
-watch(
-  [() => route.query.state as string],
-  ([toState]) => {
+watchThrottled(
+  [
+    () => route.query.state as string,
+    () => route.query.labels as string[] | string
+  ],
+  ([toState, toLabels]) => {
     state.value = ['any', 'active', 'pending', 'closed'].includes(toState)
       ? (toState as NonNullable<ProposalsFilter['state']>)
       : 'any';
+    let normalizedLabels = toLabels || [];
+    normalizedLabels = Array.isArray(normalizedLabels)
+      ? normalizedLabels
+      : [normalizedLabels];
+    labels.value = normalizedLabels.filter(id => spaceLabels.value[id]);
+
     proposalsStore.reset(props.space.id, props.space.network);
-    proposalsStore.fetch(props.space.id, props.space.network, state.value);
+    proposalsStore.fetch(props.space.id, props.space.network, {
+      state: state.value,
+      labels: labels.value
+    });
   },
-  { immediate: true }
+  { throttle: 1000, immediate: true }
 );
 
 watch(
-  [props.space, state],
-  ([toSpace, toState], [fromSpace, fromState]) => {
-    if (toSpace.id !== fromSpace?.id || toState !== fromState) {
+  [props.space, state, labels],
+  ([toSpace, toState, toLabels], [fromSpace, fromState, fromLabels]) => {
+    if (
+      toSpace.id !== fromSpace?.id ||
+      toState !== fromState ||
+      toLabels !== fromLabels
+    ) {
       const query: LocationQueryRaw = {
         ...route.query,
-        state: toState === 'any' ? undefined : toState
+        state: toState === 'any' ? undefined : toState,
+        labels: !toLabels?.length ? undefined : toLabels
       };
 
       router.push({ query });
@@ -83,7 +112,10 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
 
 <template>
   <div>
-    <div class="flex justify-between p-4 gap-2">
+    <div
+      class="flex justify-between p-4 gap-2 gap-y-3 flex-row"
+      :class="{ 'flex-col-reverse sm:flex-row': space.labels?.length }"
+    >
       <div class="flex gap-2">
         <UiSelectDropdown
           v-model="state"
@@ -115,6 +147,56 @@ watchEffect(() => setTitle(`Proposals - ${props.space.name}`));
             }
           ]"
         />
+        <div v-if="space.labels?.length" class="sm:relative">
+          <PickerLabel
+            v-model="labels"
+            :labels="space.labels"
+            :button-props="{
+              class: [
+                'flex items-center gap-2 relative rounded-full leading-[100%] min-w-[75px] max-w-[230px] border button h-[42px] top-1 text-skin-link bg-skin-bg'
+              ]
+            }"
+            :panel-props="{ class: 'sm:min-w-[290px] sm:ml-0 !mt-3' }"
+          >
+            <template #button="{ close }">
+              <div
+                class="absolute top-[-10px] bg-skin-bg px-1 left-2.5 text-sm text-skin-text"
+              >
+                Labels
+              </div>
+              <div
+                v-if="labels.length"
+                class="flex gap-1 mx-2.5 overflow-hidden items-center"
+              >
+                <ul v-if="labels.length" class="flex gap-1 mr-4">
+                  <li v-for="id in labels" :key="id">
+                    <UiProposalLabel
+                      :label="spaceLabels[id].name"
+                      :color="spaceLabels[id].color"
+                    />
+                  </li>
+                </ul>
+                <div
+                  class="flex items-center absolute rounded-r-full right-[1px] pr-2 h-[23px] bg-skin-bg"
+                >
+                  <div
+                    class="block w-2 -ml-2 h-full bg-gradient-to-l from-skin-bg"
+                  />
+                  <button
+                    v-if="labels.length"
+                    class="text-skin-text rounded-full hover:text-skin-link"
+                    title="Clear all labels"
+                    @click.stop="handleClearLabelsFilter(close)"
+                    @keydown.enter.stop="handleClearLabelsFilter(close)"
+                  >
+                    <IH-x-circle size="16" />
+                  </button>
+                </div>
+              </div>
+              <span v-else class="px-3 text-skin-link">Any</span>
+            </template>
+          </PickerLabel>
+        </div>
       </div>
       <div class="flex gap-2 truncate">
         <IndicatorVotingPower

From dbfcfc03845d344d94301913eedb022df18fe927 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Wed, 27 Nov 2024 18:00:01 +0800
Subject: [PATCH 45/59] feat: add link to label (#924)

* fix: allow voting power indicator to shrink

* feat: add labels filter to proposals

* fix: improve filters UI

* feat: persist proposals filters in query param

* fix: allow voting power indicator to shrink

* feat: link proposal label to filtered proposals page

* fix: proposal list should react to url change

* fix: proposals list should refresh on url labels changer

* fix: standardize spacing in editor sidebar

* refactor: refactor proposals labels component

* feat: persist state filter in url

* fix: reduce label height to keep same line height as proposal title

* fix: use line height to control label height

* revert: revert changes

* fix: decrease spacing

* fix: remove duplicate watcher

* fix: improve responsive layout

* fix: ignore invalid label id from query param

* fix: enable outline on labels filter button

* fix: fix left margin on combobox

* perf: improve labels validation

* fix: prevent event bubbling

* fix: fix combobox min width on small screen

* feat: add link to label

* fix: fix spacing

* fix: use simple notation for doublons query params

* refactor: move the optional to check to AppLink

---------

Co-authored-by: Chaitanya <yourchaitu@gmail.com>
---
 apps/ui/src/components/AppLink.vue            |  9 +++++--
 apps/ui/src/components/ProposalLabels.vue     | 27 +++++++++++++++++--
 .../components/ProposalsListItemHeading.vue   | 10 +++----
 apps/ui/src/components/Ui/ProposalLabel.vue   |  8 ++++--
 apps/ui/src/views/Proposal.vue                |  6 ++++-
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/apps/ui/src/components/AppLink.vue b/apps/ui/src/components/AppLink.vue
index 7a42c13ba..795488cc5 100644
--- a/apps/ui/src/components/AppLink.vue
+++ b/apps/ui/src/components/AppLink.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import { RouteLocationRaw, RouterLinkProps } from 'vue-router';
 
-const props = defineProps<RouterLinkProps>();
+const props = defineProps<
+  Omit<RouterLinkProps, 'to'> & { to?: RouteLocationRaw }
+>();
 
 const { isWhiteLabel } = useWhiteLabel();
 
@@ -32,7 +34,10 @@ function normalize(to: RouteLocationRaw) {
 </script>
 
 <template>
-  <router-link :to="normalize(props.to)">
+  <router-link v-if="props.to" :to="normalize(props.to)">
     <slot />
   </router-link>
+  <div v-else>
+    <slot />
+  </div>
 </template>
diff --git a/apps/ui/src/components/ProposalLabels.vue b/apps/ui/src/components/ProposalLabels.vue
index d91e52e25..8264814e1 100644
--- a/apps/ui/src/components/ProposalLabels.vue
+++ b/apps/ui/src/components/ProposalLabels.vue
@@ -6,9 +6,11 @@ const props = withDefaults(
     space: Space;
     labels: string[];
     inline?: boolean;
+    withLink?: boolean;
   }>(),
   {
-    inline: false
+    inline: false,
+    withLink: false
   }
 );
 
@@ -27,6 +29,15 @@ const validLabels = computed(() => {
       :key="label.id"
       :label="label.name"
       :color="label.color"
+      :to="
+        withLink
+          ? {
+              name: 'space-proposals',
+              params: { space: `${space.network}:${space.id}` },
+              query: { labels: label.id }
+            }
+          : undefined
+      "
       v-bind="$attrs"
       class="inline-flex !max-w-[160px] mr-1 last:mr-0"
     />
@@ -38,7 +49,19 @@ const validLabels = computed(() => {
   >
     <li v-for="label in validLabels" :key="label.id">
       <UiTooltip :title="label.description" class="inline">
-        <UiProposalLabel :label="label.name" :color="label.color" />
+        <UiProposalLabel
+          :label="label.name"
+          :color="label.color"
+          :to="
+            withLink
+              ? {
+                  name: 'space-proposals',
+                  params: { space: `${space.network}:${space.id}` },
+                  query: { labels: label.id }
+                }
+              : undefined
+          "
+        />
       </UiTooltip>
     </li>
   </ul>
diff --git a/apps/ui/src/components/ProposalsListItemHeading.vue b/apps/ui/src/components/ProposalsListItemHeading.vue
index c422da0aa..f886af602 100644
--- a/apps/ui/src/components/ProposalsListItemHeading.vue
+++ b/apps/ui/src/components/ProposalsListItemHeading.vue
@@ -43,8 +43,7 @@ const space = computed(() =>
       >
         <ProposalIconStatus size="17" :state="proposal.state" class="top-1.5" />
       </AppLink>
-
-      <div class="min-w-0 my-1 items-center leading-6">
+      <div class="min-w-0 my-1 items-center leading-6 space-x-2">
         <AppLink
           v-if="showSpace"
           :to="{
@@ -53,11 +52,10 @@ const space = computed(() =>
               space: `${proposal.network}:${proposal.space.id}`
             }
           }"
-          class="text-[21px] text-skin-text mr-2 font-bold inline shrink-0"
+          class="text-[21px] text-skin-text font-bold inline shrink-0"
         >
           {{ proposal.space.name }}
         </AppLink>
-
         <AppLink
           :to="{
             name: 'space-proposal-overview',
@@ -66,9 +64,10 @@ const space = computed(() =>
               space: `${proposal.network}:${proposal.space.id}`
             }
           }"
+          class="space-x-2"
         >
           <h3
-            class="text-[21px] inline [overflow-wrap:anywhere] mr-2 min-w-0"
+            class="text-[21px] inline [overflow-wrap:anywhere] min-w-0"
             v-text="proposal.title || `Proposal #${proposal.proposal_id}`"
           />
           <ProposalLabels
@@ -76,6 +75,7 @@ const space = computed(() =>
             :labels="proposal.labels"
             :space="space"
             inline
+            with-link
           />
           <IH-check
             v-if="
diff --git a/apps/ui/src/components/Ui/ProposalLabel.vue b/apps/ui/src/components/Ui/ProposalLabel.vue
index 47fd1b528..b43295367 100644
--- a/apps/ui/src/components/Ui/ProposalLabel.vue
+++ b/apps/ui/src/components/Ui/ProposalLabel.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
+import { RouteLocationNamedRaw } from 'vue-router';
+
 const props = defineProps<{
   label: string;
   color: string;
+  to?: RouteLocationNamedRaw;
 }>();
 
 const { currentMode } = useUserSkin();
@@ -46,7 +49,8 @@ function checkColorProximity(color: string): {
 </script>
 
 <template>
-  <div
+  <AppLink
+    :to="to"
     class="rounded-full w-fit max-w-[220px] shrink-0 flex"
     :class="{
       border: colorProperties.showBorder
@@ -60,5 +64,5 @@ function checkColorProximity(color: string): {
       class="truncate text-sm leading-[11px] whitespace-nowrap px-2 py-[6px]"
       v-text="label"
     />
-  </div>
+  </AppLink>
 </template>
diff --git a/apps/ui/src/views/Proposal.vue b/apps/ui/src/views/Proposal.vue
index 9aac8c7ad..a2621f139 100644
--- a/apps/ui/src/views/Proposal.vue
+++ b/apps/ui/src/views/Proposal.vue
@@ -345,7 +345,11 @@ watchEffect(() => {
               <IH-tag />
               Labels
             </h4>
-            <ProposalLabels :labels="proposal.labels" :space="space" />
+            <ProposalLabels
+              :labels="proposal.labels"
+              :space="space"
+              with-link
+            />
           </div>
           <div>
             <h4 class="mb-2.5 eyebrow flex items-center gap-2">

From f8c421a0e4bcd3b4ed6d788aab33e620bac0e4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Wed, 27 Nov 2024 12:15:32 +0100
Subject: [PATCH 46/59] feat: format quorum using compact format (#994)

---
 apps/ui/src/components/ProposalResults.vue    |  5 ++--
 .../components/ProposalsListItemHeading.vue   |  7 +++---
 apps/ui/src/helpers/quorum.test.ts            | 23 +++++++++++++++++++
 apps/ui/src/helpers/quorum.ts                 | 11 +++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 apps/ui/src/helpers/quorum.test.ts

diff --git a/apps/ui/src/components/ProposalResults.vue b/apps/ui/src/components/ProposalResults.vue
index 244aaf81c..d41da256f 100644
--- a/apps/ui/src/components/ProposalResults.vue
+++ b/apps/ui/src/components/ProposalResults.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  formatQuorum,
   quorumChoiceProgress,
   quorumLabel,
   quorumProgress
@@ -97,7 +98,7 @@ const otherResultsSummary = computed(() => {
       </a>
       <div v-if="proposal.quorum" class="mt-3.5">
         {{ quorumLabel(proposal.quorum_type) }}:
-        <span class="text-skin-link">{{ _p(totalProgress) }}</span>
+        <span class="text-skin-link">{{ formatQuorum(totalProgress) }}</span>
       </div>
     </div>
   </div>
@@ -177,7 +178,7 @@ const otherResultsSummary = computed(() => {
       </button>
       <div v-if="proposal.quorum">
         {{ quorumLabel(proposal.quorum_type) }}:
-        <span class="text-skin-link">{{ _p(totalProgress) }}</span>
+        <span class="text-skin-link">{{ formatQuorum(totalProgress) }}</span>
       </div>
       <div v-if="proposal.privacy === 'shutter'" class="mt-2.5">
         <a
diff --git a/apps/ui/src/components/ProposalsListItemHeading.vue b/apps/ui/src/components/ProposalsListItemHeading.vue
index f886af602..d269275b7 100644
--- a/apps/ui/src/components/ProposalsListItemHeading.vue
+++ b/apps/ui/src/components/ProposalsListItemHeading.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { quorumLabel, quorumProgress } from '@/helpers/quorum';
-import { _n, _p, _rt, getProposalId, shortenAddress } from '@/helpers/utils';
+import { formatQuorum, quorumLabel, quorumProgress } from '@/helpers/quorum';
+import { _n, _rt, getProposalId, shortenAddress } from '@/helpers/utils';
 import { Proposal as ProposalType } from '@/types';
 
 const props = withDefaults(
@@ -110,7 +110,8 @@ const space = computed(() =>
         {{ proposal.vote_count !== 1 ? 'votes' : 'vote' }}
       </template>
       <span v-if="proposal.quorum" class="lowercase">
-        · {{ _p(totalProgress) }} {{ quorumLabel(proposal.quorum_type) }}
+        · {{ formatQuorum(totalProgress) }}
+        {{ quorumLabel(proposal.quorum_type) }}
       </span>
       ·
       <button
diff --git a/apps/ui/src/helpers/quorum.test.ts b/apps/ui/src/helpers/quorum.test.ts
new file mode 100644
index 000000000..199e7b22c
--- /dev/null
+++ b/apps/ui/src/helpers/quorum.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+import { formatQuorum } from './quorum';
+
+describe('formatQuorum', () => {
+  it('should format using 3 significant digits', () => {
+    expect(formatQuorum(0.001)).toBe('0.1%');
+    expect(formatQuorum(0.1234)).toBe('12.3%');
+    expect(formatQuorum(0.555667)).toBe('55.5%');
+    expect(formatQuorum(4.446326)).toBe('444%');
+    expect(formatQuorum(999.90111)).toBe('99.9k%');
+  });
+
+  it('should not round up but truncate', () => {
+    expect(formatQuorum(0.9999)).toBe('99.9%');
+  });
+
+  it('should format big numbers in compact format', () => {
+    expect(formatQuorum(1000)).toBe('100k%');
+    expect(formatQuorum(1234)).toBe('123k%');
+    expect(formatQuorum(5556)).toBe('555k%');
+    expect(formatQuorum(44444)).toBe('4.44m%');
+  });
+});
diff --git a/apps/ui/src/helpers/quorum.ts b/apps/ui/src/helpers/quorum.ts
index 065e18048..18973720c 100644
--- a/apps/ui/src/helpers/quorum.ts
+++ b/apps/ui/src/helpers/quorum.ts
@@ -28,3 +28,14 @@ export function quorumChoiceProgress(
 export function quorumLabel(quorumType: Proposal['quorum_type']): string {
   return `Quorum${quorumType === 'rejection' ? ' of reject' : ''}`;
 }
+
+export function formatQuorum(value: number) {
+  const formatter = new Intl.NumberFormat('en', {
+    notation: 'compact',
+    maximumSignificantDigits: 3,
+    roundingMode: 'trunc',
+    style: 'percent'
+  });
+
+  return formatter.format(value).toLowerCase();
+}

From 30f3e9693f163f4cf3c8c25097fdbd023c506d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Wed, 27 Nov 2024 13:37:31 +0100
Subject: [PATCH 47/59] feat: add trace208 oz votes strategy to mainnet (#999)

---
 apps/ui/src/networks/starknet/constants.ts | 3 ++-
 packages/sx.js/src/starknetNetworks.ts     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/networks/starknet/constants.ts b/apps/ui/src/networks/starknet/constants.ts
index 94c778a44..bd21c3d81 100644
--- a/apps/ui/src/networks/starknet/constants.ts
+++ b/apps/ui/src/networks/starknet/constants.ts
@@ -452,7 +452,8 @@ export function createConstants(
           createSlotValueStrategyConfig(
             config.Strategies.OZVotesTrace208StorageProof,
             'OZ Votes storage proof (trace 208)',
-            'A strategy that allows to use the value of an slot on EVM chain (for example ERC-20 balance on L1) as voting power including delegated balances (trace 208 format).'
+            'A strategy that allows to use the value of an slot on EVM chain (for example ERC-20 balance on L1) as voting power including delegated balances (trace 208 format).',
+            `${HELPDESK_URL}/en/articles/9839152-oz-votes-storage-proof-voting-strategy`
           )
         ]
       : [])
diff --git a/packages/sx.js/src/starknetNetworks.ts b/packages/sx.js/src/starknetNetworks.ts
index b2f61b51b..1d3434a5d 100644
--- a/packages/sx.js/src/starknetNetworks.ts
+++ b/packages/sx.js/src/starknetNetworks.ts
@@ -118,7 +118,8 @@ export const starknetNetworks = {
         '0x699e53f4b40e19d96b8020386dbeeb156f40172d7bbb78b2a4204cf64ae75f',
       OZVotesStorageProof:
         '0x7ee3cf64f1072fe21570356eb57d4e9f78169ea9235ba610f60a8b33c36cc6e',
-      OZVotesTrace208StorageProof: ''
+      OZVotesTrace208StorageProof:
+        '0x06e7bf6fc2ac80d216076b3340625d3d054d2f4a1d7dc4a22853c06e015907b3'
     },
     ProposalValidations: {
       VotingPower:

From bb058d7e5a0ab0766cfd6b7eda4b2e6f5c196147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Thu, 28 Nov 2024 08:55:25 +0100
Subject: [PATCH 48/59] fix: truncate too long choices (#996)

* fix: truncate too long choices

* feat: justify with space-between

* feat: use link border if vote is editable

* feat: use text-skin-link even if vote is not editable
---
 apps/ui/src/components/ProposalVote.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/ui/src/components/ProposalVote.vue b/apps/ui/src/components/ProposalVote.vue
index 3f84fb3a3..114a1d57d 100644
--- a/apps/ui/src/components/ProposalVote.vue
+++ b/apps/ui/src/components/ProposalVote.vue
@@ -57,19 +57,21 @@ const isEditable = computed(() => {
 <template>
   <slot v-if="currentVote && !editMode" name="voted" :vote="currentVote">
     <UiButton
-      class="!h-[48px] text-left w-full flex items-center rounded-lg space-x-2"
+      class="!h-[48px] text-left w-full flex items-center justify-between rounded-lg space-x-2"
+      :class="{
+        'border-skin-link': isEditable
+      }"
       :disabled="!isEditable"
       @click="$emit('enterEditMode')"
     >
       <div
         v-if="proposal.privacy"
-        class="flex space-x-2 items-center grow truncate"
-        :class="{ 'text-skin-text': !isEditable }"
+        class="flex space-x-2 items-center grow truncate text-skin-link"
       >
         <IH-lock-closed class="size-[16px] shrink-0" />
         <span class="truncate">Encrypted choice</span>
       </div>
-      <div v-else class="flex items-center gap-2">
+      <div v-else class="flex items-center gap-2 overflow-hidden">
         <div
           v-if="proposal.type === 'basic'"
           class="shrink-0 rounded-full choice-bg inline-block size-[18px]"
@@ -89,8 +91,7 @@ const isEditable = computed(() => {
           />
         </div>
         <div
-          class="grow truncate"
-          :class="{ 'text-skin-text': !isEditable }"
+          class="grow truncate text-skin-link"
           v-text="getChoiceText(proposal.choices, currentVote.choice)"
         />
       </div>

From ff835598783aa6fa5bb63679b8c695182988cb55 Mon Sep 17 00:00:00 2001
From: Less <bonustrack@users.noreply.github.com>
Date: Thu, 28 Nov 2024 14:57:31 +0700
Subject: [PATCH 49/59] fix: remove padding on OZ trace 208 voting strategy
 (#1001)

---
 packages/sx.js/src/starknetNetworks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sx.js/src/starknetNetworks.ts b/packages/sx.js/src/starknetNetworks.ts
index 1d3434a5d..ff3ae20fe 100644
--- a/packages/sx.js/src/starknetNetworks.ts
+++ b/packages/sx.js/src/starknetNetworks.ts
@@ -119,7 +119,7 @@ export const starknetNetworks = {
       OZVotesStorageProof:
         '0x7ee3cf64f1072fe21570356eb57d4e9f78169ea9235ba610f60a8b33c36cc6e',
       OZVotesTrace208StorageProof:
-        '0x06e7bf6fc2ac80d216076b3340625d3d054d2f4a1d7dc4a22853c06e015907b3'
+        '0x6e7bf6fc2ac80d216076b3340625d3d054d2f4a1d7dc4a22853c06e015907b3'
     },
     ProposalValidations: {
       VotingPower:

From 0d81eef8713670efe8eb68236da36580951134f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Thu, 28 Nov 2024 08:57:52 +0100
Subject: [PATCH 50/59] feat: add create space link on explore page (#1000)

* feat: add create space link on explore page

* feat: add create space link in settings

* chore: handle types
---
 apps/ui/src/components/AppLink.vue    |  9 ++++++++-
 apps/ui/src/views/My/Explore.vue      | 14 ++++++++++++--
 apps/ui/src/views/Settings/Spaces.vue | 16 ++++++++++++++--
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/apps/ui/src/components/AppLink.vue b/apps/ui/src/components/AppLink.vue
index 795488cc5..9692c61ed 100644
--- a/apps/ui/src/components/AppLink.vue
+++ b/apps/ui/src/components/AppLink.vue
@@ -7,6 +7,10 @@ const props = defineProps<
 
 const { isWhiteLabel } = useWhiteLabel();
 
+function isExternalLink(to: RouteLocationRaw | undefined): to is string {
+  return typeof to === 'string' && to.startsWith('http');
+}
+
 function normalize(to: RouteLocationRaw) {
   if (
     !isWhiteLabel.value ||
@@ -34,7 +38,10 @@ function normalize(to: RouteLocationRaw) {
 </script>
 
 <template>
-  <router-link v-if="props.to" :to="normalize(props.to)">
+  <a v-if="isExternalLink(props.to)" :href="props.to" target="_blank">
+    <slot />
+  </a>
+  <router-link v-else-if="props.to" :to="normalize(props.to)">
     <slot />
   </router-link>
   <div v-else>
diff --git a/apps/ui/src/views/My/Explore.vue b/apps/ui/src/views/My/Explore.vue
index c0adf678b..f685e7a64 100644
--- a/apps/ui/src/views/My/Explore.vue
+++ b/apps/ui/src/views/My/Explore.vue
@@ -144,8 +144,8 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="flex justify-between">
-    <div class="flex flex-row flex-wrap p-4 gap-2">
+  <div class="flex justify-between p-4 gap-2 gap-y-3 flex-row">
+    <div class="flex flex-row flex-wrap gap-2">
       <UiSelectDropdown
         v-model="protocol"
         class="min-h-[46px]"
@@ -176,6 +176,16 @@ onMounted(() => {
         :items="categories"
       />
     </div>
+    <UiTooltip title="Create new space">
+      <UiButton
+        :to="
+          protocol === 'snapshot' ? 'https://snapshot.org/#/setup' : 'create'
+        "
+        class="!px-0 w-[46px]"
+      >
+        <IH-plus-sm />
+      </UiButton>
+    </UiTooltip>
   </div>
   <div>
     <UiLabel label="Spaces" sticky />
diff --git a/apps/ui/src/views/Settings/Spaces.vue b/apps/ui/src/views/Settings/Spaces.vue
index 3f591ecb7..53265424c 100644
--- a/apps/ui/src/views/Settings/Spaces.vue
+++ b/apps/ui/src/views/Settings/Spaces.vue
@@ -56,8 +56,8 @@ watch(
 </script>
 
 <template>
-  <div class="flex justify-between">
-    <div class="flex flex-row p-4 space-x-2">
+  <div class="flex justify-between p-4 gap-2 gap-y-3 flex-row">
+    <div class="flex flex-row space-x-2">
       <UiSelectDropdown
         v-model="spacesStore.protocol"
         title="Protocol"
@@ -66,6 +66,18 @@ watch(
         :items="protocols"
       />
     </div>
+    <UiTooltip title="Create new space">
+      <UiButton
+        :to="
+          spacesStore.protocol === 'snapshot'
+            ? 'https://snapshot.org/#/setup'
+            : 'create'
+        "
+        class="!px-0 w-[46px]"
+      >
+        <IH-plus-sm />
+      </UiButton>
+    </UiTooltip>
   </div>
   <UiLabel label="My spaces" sticky />
   <UiLoading v-if="loading" class="block m-4" />

From 4b45ddd6e4b058c4f2acf87ae26bed077ff918f0 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:32:28 +0800
Subject: [PATCH 51/59] feat: show warning message for flagged proposals (#998)

---
 apps/ui/src/networks/common/graphqlApi/index.ts | 3 ++-
 apps/ui/src/networks/offchain/api/index.ts      | 3 ++-
 apps/ui/src/networks/offchain/api/queries.ts    | 1 +
 apps/ui/src/networks/offchain/api/types.ts      | 1 +
 apps/ui/src/types.ts                            | 1 +
 apps/ui/src/views/Proposal/Overview.vue         | 5 +++++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/networks/common/graphqlApi/index.ts b/apps/ui/src/networks/common/graphqlApi/index.ts
index dcece27cd..ef51ae911 100644
--- a/apps/ui/src/networks/common/graphqlApi/index.ts
+++ b/apps/ui/src/networks/common/graphqlApi/index.ts
@@ -296,7 +296,8 @@ function formatProposal(
     state: getProposalState(proposal, current),
     network: networkId,
     privacy: null,
-    quorum: +proposal.quorum
+    quorum: +proposal.quorum,
+    flagged: false
   };
 }
 
diff --git a/apps/ui/src/networks/offchain/api/index.ts b/apps/ui/src/networks/offchain/api/index.ts
index d90c3288e..21c718ce2 100644
--- a/apps/ui/src/networks/offchain/api/index.ts
+++ b/apps/ui/src/networks/offchain/api/index.ts
@@ -319,7 +319,8 @@ function formatProposal(proposal: ApiProposal, networkId: NetworkID): Proposal {
     tx: '',
     execution_tx: null,
     veto_tx: null,
-    privacy: proposal.privacy
+    privacy: proposal.privacy,
+    flagged: proposal.flagged
   };
 }
 
diff --git a/apps/ui/src/networks/offchain/api/queries.ts b/apps/ui/src/networks/offchain/api/queries.ts
index 1bc683f27..f0f5c2de3 100644
--- a/apps/ui/src/networks/offchain/api/queries.ts
+++ b/apps/ui/src/networks/offchain/api/queries.ts
@@ -143,6 +143,7 @@ const PROPOSAL_FRAGMENT = gql`
     votes
     privacy
     plugins
+    flagged
   }
 `;
 
diff --git a/apps/ui/src/networks/offchain/api/types.ts b/apps/ui/src/networks/offchain/api/types.ts
index 75d5ebef0..7ed7eb848 100644
--- a/apps/ui/src/networks/offchain/api/types.ts
+++ b/apps/ui/src/networks/offchain/api/types.ts
@@ -125,6 +125,7 @@ export type ApiProposal = {
   votes: number;
   privacy: Privacy;
   plugins: Record<string, any>;
+  flagged: boolean;
 };
 
 export type ApiVote = {
diff --git a/apps/ui/src/types.ts b/apps/ui/src/types.ts
index 6f0ca6131..7623c7afd 100644
--- a/apps/ui/src/types.ts
+++ b/apps/ui/src/types.ts
@@ -283,6 +283,7 @@ export type Proposal = {
   cancelled: boolean;
   state: ProposalState;
   privacy: Privacy;
+  flagged: boolean;
 };
 
 export type UserProfile = {
diff --git a/apps/ui/src/views/Proposal/Overview.vue b/apps/ui/src/views/Proposal/Overview.vue
index ab08f9595..db481c4b1 100644
--- a/apps/ui/src/views/Proposal/Overview.vue
+++ b/apps/ui/src/views/Proposal/Overview.vue
@@ -200,6 +200,11 @@ onBeforeUnmount(() => destroyAudio());
 <template>
   <UiContainer class="pt-5 !max-w-[710px] mx-0 md:mx-auto">
     <div>
+      <UiAlert v-if="proposal.flagged" type="error" class="mb-3">
+        This proposal might contain scams, offensive material, or be malicious
+        in nature. Please proceed with caution.
+      </UiAlert>
+
       <h1 class="mb-3 text-[40px] leading-[1.1em] break-words">
         {{ proposal.title || `Proposal #${proposal.proposal_id}` }}
       </h1>

From 6a8b3ed8cacea1feefad272803710105d3e29f65 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:27:06 +0800
Subject: [PATCH 52/59] refactor: create dedicated composable for proposing
 power (#988)

* refactor: extract proposing power into its own composable

* fix: use proposition variant everywhere
---
 .../ui/src/composables/usePropositionPower.ts | 40 +++++++++++++++++++
 apps/ui/src/views/Space/Editor.vue            | 29 +++++++++-----
 2 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 apps/ui/src/composables/usePropositionPower.ts

diff --git a/apps/ui/src/composables/usePropositionPower.ts b/apps/ui/src/composables/usePropositionPower.ts
new file mode 100644
index 000000000..e8cc15cb5
--- /dev/null
+++ b/apps/ui/src/composables/usePropositionPower.ts
@@ -0,0 +1,40 @@
+import { supportsNullCurrent } from '@/networks';
+import { getIndex } from '@/stores/votingPowers';
+import { NetworkID, Space } from '@/types';
+
+export function usePropositionPower() {
+  const votingPowersStore = useVotingPowersStore();
+  const { web3 } = useWeb3();
+  const { getCurrent } = useMetaStore();
+
+  function latestBlock(network: NetworkID) {
+    return supportsNullCurrent(network) ? null : getCurrent(network) ?? 0;
+  }
+
+  function fetch(space: Space) {
+    votingPowersStore.fetch(
+      space,
+      web3.value.account,
+      latestBlock(space.network)
+    );
+  }
+
+  function get(space: Space) {
+    return votingPowersStore.votingPowers.get(
+      getIndex(space, latestBlock(space.network))
+    );
+  }
+
+  function reset() {
+    votingPowersStore.reset();
+  }
+
+  watch(
+    () => web3.value.account,
+    account => {
+      if (!account) reset();
+    }
+  );
+
+  return { fetch, get };
+}
diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
index 227df8fe7..961cae7d7 100644
--- a/apps/ui/src/views/Space/Editor.vue
+++ b/apps/ui/src/views/Space/Editor.vue
@@ -47,7 +47,8 @@ const {
   reset
 } = useWalletConnectTransaction();
 const proposalsStore = useProposalsStore();
-const { votingPower, fetch: fetchVotingPower } = useVotingPower();
+const { get: getPropositionPower, fetch: fetchPropositionPower } =
+  usePropositionPower();
 const { strategiesWithTreasuries } = useTreasuries(props.space);
 const termsStore = useTermsStore();
 
@@ -154,7 +155,7 @@ const canSubmit = computed(() => {
   if (Object.keys(formErrors.value).length > 0) return false;
 
   return web3.value.account
-    ? votingPower.value?.canPropose
+    ? propositionPower.value?.canPropose
     : !web3.value.authLoading;
 });
 const spaceType = computed(() =>
@@ -167,6 +168,8 @@ const proposalLimitReached = computed(
     (props.space.proposal_count_30d || 0) >= MAX_30D_PROPOSALS[spaceType.value]
 );
 
+const propositionPower = computed(() => getPropositionPower(props.space));
+
 async function handleProposeClick() {
   if (!proposal.value) return;
 
@@ -278,8 +281,8 @@ function handleTransactionAccept() {
   reset();
 }
 
-function handleFetchVotingPower() {
-  fetchVotingPower(props.space);
+function handleFetchPropositionPower() {
+  fetchPropositionPower(props.space);
 }
 
 watch(
@@ -287,7 +290,7 @@ watch(
   toAccount => {
     if (!toAccount) return;
 
-    handleFetchVotingPower();
+    handleFetchPropositionPower();
   },
   { immediate: true }
 );
@@ -358,7 +361,9 @@ watchEffect(() => {
         class="primary min-w-[46px] flex gap-2 justify-center items-center !px-0 md:!px-3"
         :loading="
           !!web3.account &&
-          (sending || !votingPower || votingPower.status === 'loading')
+          (sending ||
+            !propositionPower ||
+            propositionPower.status === 'loading')
         "
         :disabled="!canSubmit"
         @click="handleProposeClick"
@@ -373,14 +378,16 @@ watchEffect(() => {
     <div class="md:mr-[340px]">
       <UiContainer class="pt-5 !max-w-[710px] mx-0 md:mx-auto s-box">
         <MessageVotingPower
-          v-if="votingPower"
+          v-if="propositionPower"
           class="mb-4"
-          :voting-power="votingPower"
+          :voting-power="propositionPower"
           action="propose"
-          @fetch-voting-power="handleFetchVotingPower"
+          @fetch-voting-power="handleFetchPropositionPower"
         />
         <UiAlert
-          v-if="votingPower && spaceType === 'default' && proposalLimitReached"
+          v-if="
+            propositionPower && spaceType === 'default' && proposalLimitReached
+          "
           type="error"
           class="mb-4"
         >
@@ -396,7 +403,7 @@ watchEffect(() => {
         </UiAlert>
         <UiAlert
           v-else-if="
-            votingPower && spaceType !== 'turbo' && proposalLimitReached
+            propositionPower && spaceType !== 'turbo' && proposalLimitReached
           "
           type="error"
           class="mb-4"

From 3bd09f9a0aa3827fe75dbf2849e80a85b8d046b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Thu, 28 Nov 2024 18:34:39 +0100
Subject: [PATCH 53/59] chore: update oz votes strategy address (#1004)

Co-authored-by: Less <bonustrack@users.noreply.github.com>
---
 apps/api/package.json                  | 2 +-
 packages/sx.js/src/starknetNetworks.ts | 2 +-
 yarn.lock                              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index f99b0411e..62e78ef42 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -23,7 +23,7 @@
     "@ethersproject/providers": "^5.7.2",
     "@ethersproject/units": "^5.6.1",
     "@faker-js/faker": "^7.4.0",
-    "@snapshot-labs/checkpoint": "^0.1.0-beta.43",
+    "@snapshot-labs/checkpoint": "^0.1.0-beta.44",
     "@snapshot-labs/sx": "^0.1.0",
     "@types/bn.js": "^5.1.0",
     "@types/mysql": "^2.15.21",
diff --git a/packages/sx.js/src/starknetNetworks.ts b/packages/sx.js/src/starknetNetworks.ts
index ff3ae20fe..187f2d1db 100644
--- a/packages/sx.js/src/starknetNetworks.ts
+++ b/packages/sx.js/src/starknetNetworks.ts
@@ -119,7 +119,7 @@ export const starknetNetworks = {
       OZVotesStorageProof:
         '0x7ee3cf64f1072fe21570356eb57d4e9f78169ea9235ba610f60a8b33c36cc6e',
       OZVotesTrace208StorageProof:
-        '0x6e7bf6fc2ac80d216076b3340625d3d054d2f4a1d7dc4a22853c06e015907b3'
+        '0x50bceb018e677f281b30587406b8210a0d8fbf37e58299bb7c6ec0e8dd212a3'
     },
     ProposalValidations: {
       VotingPower:
diff --git a/yarn.lock b/yarn.lock
index 7bb30486d..6501aab6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2445,10 +2445,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@snapshot-labs/checkpoint@^0.1.0-beta.43":
-  version "0.1.0-beta.43"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.43.tgz#56118320a17ff7cda46364ad70b399fd3b8ec869"
-  integrity sha512-GIGEx6OQlDyfxfLapyXsWMVhEvzRJ51V9cIAvjG1htrVBhnuFmo321SxAdioMcsk98K0yU4qQWxcv4IFPmYB0w==
+"@snapshot-labs/checkpoint@^0.1.0-beta.44":
+  version "0.1.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/checkpoint/-/checkpoint-0.1.0-beta.44.tgz#61bac9957fcaf1fcdbd819a99deba02bdc7705f8"
+  integrity sha512-SE4p0TLAwb28phlfKp02obBUm4wlAwpf+gxuv40t1ei3vuYGeBHeGhoOsvCIKaUDXqyUbicdwQ2BE2WDEU2HIQ==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     "@ethersproject/address" "^5.7.0"

From 46caf0ae2d387e47a2f211c73720f9355c7797d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Tkaczy=C5=84ski?= <wiktor.tkaczynski@gmail.com>
Date: Thu, 28 Nov 2024 23:15:56 +0100
Subject: [PATCH 54/59] chore: bring back API reset (#1005)

Newer version adds reorg support so also a new database schema
so reset is needed to call createStore.
---
 apps/api/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index d1bbf2655..170f04eac 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -65,7 +65,7 @@ async function run() {
     await sleep(PRODUCTION_INDEXER_DELAY);
   }
 
-  // await checkpoint.reset();
+  await checkpoint.reset();
   checkpoint.start();
 }
 

From ff5bf07bba44c47794cffbd165aaeb8fdf4e4ba9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2024 13:41:27 +0530
Subject: [PATCH 55/59] chore(deps): bump @snapshot-labs/snapshot.js in the
 snapshot group (#1006)

Bumps the snapshot group with 1 update: [@snapshot-labs/snapshot.js](https://github.com/snapshot-labs/snapshot.js).


Updates `@snapshot-labs/snapshot.js` from 0.12.32 to 0.12.33
- [Release notes](https://github.com/snapshot-labs/snapshot.js/releases)
- [Commits](https://github.com/snapshot-labs/snapshot.js/compare/v0.12.32...v0.12.33)

---
updated-dependencies:
- dependency-name: "@snapshot-labs/snapshot.js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: snapshot
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/ui/package.json | 2 +-
 yarn.lock            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/ui/package.json b/apps/ui/package.json
index a4ad16376..0e51753c4 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -50,7 +50,7 @@
     "@snapshot-labs/lock": "^0.2.8",
     "@snapshot-labs/pineapple": "^1.1.0",
     "@snapshot-labs/prettier-config": "^0.1.0-beta.18",
-    "@snapshot-labs/snapshot.js": "^0.12.32",
+    "@snapshot-labs/snapshot.js": "^0.12.33",
     "@snapshot-labs/sx": "^0.1.0",
     "@vueuse/core": "^10.4.1",
     "@walletconnect/core": "^2.11.0",
diff --git a/yarn.lock b/yarn.lock
index 6501aab6b..41849dc3f 100644
--- 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.32":
-  version "0.12.32"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.32.tgz#a92522c8563cf9849706ba6ea5592672aba8adde"
-  integrity sha512-GRmGMjcR8qdRE94QydVQVPf93lKjJp+J/ISoSTVp3oxKrkBEzY0DZx9gFlysBqF/h69PEeykJWUOH1YfQocYHw==
+"@snapshot-labs/snapshot.js@^0.12.33":
+  version "0.12.33"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.33.tgz#3ce3166419931ef31f1070449318b98b9c482078"
+  integrity sha512-N5diNuGsglbcQ/t63EdnpUvl2bQO6TerpJE4bA+QHCEoqy/XQdqUjksosn/MWKt1gQfBjTYiN3aPGV4uj1mspA==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"

From f531d0697deb6276b9911043c9ab32331513c51d Mon Sep 17 00:00:00 2001
From: less <fabien@bonustrack.co>
Date: Sun, 1 Dec 2024 00:41:40 +0700
Subject: [PATCH 56/59] chore: update links to docs

---
 apps/ui/src/components/FormSpaceAdvanced.vue | 4 ++--
 apps/ui/src/components/Site/Footer.vue       | 8 +-------
 apps/ui/src/components/Site/Topnav.vue       | 2 +-
 apps/ui/src/helpers/turbo.ts                 | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/ui/src/components/FormSpaceAdvanced.vue b/apps/ui/src/components/FormSpaceAdvanced.vue
index 415919419..80857fbd2 100644
--- a/apps/ui/src/components/FormSpaceAdvanced.vue
+++ b/apps/ui/src/components/FormSpaceAdvanced.vue
@@ -148,7 +148,7 @@ watchEffect(() => {
   <h4 class="eyebrow mb-2 font-medium">Sub-spaces</h4>
   <UiMessage
     type="info"
-    :learn-more-link="'https://docs.snapshot.org/user-guides/spaces/sub-spaces'"
+    :learn-more-link="'https://docs.snapshot.box/user-guides/spaces/sub-spaces'"
   >
     Add a sub-space to display its proposals within your space. If you want the
     current space to be displayed on the sub-space's page, the space need to be
@@ -199,7 +199,7 @@ watchEffect(() => {
   <h4 class="eyebrow mb-2 font-medium mt-4">Custom domain</h4>
   <UiMessage
     type="info"
-    :learn-more-link="'https://docs.snapshot.org/spaces/add-custom-domain'"
+    :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.
diff --git a/apps/ui/src/components/Site/Footer.vue b/apps/ui/src/components/Site/Footer.vue
index 72b81ae0a..969f55189 100644
--- a/apps/ui/src/components/Site/Footer.vue
+++ b/apps/ui/src/components/Site/Footer.vue
@@ -72,15 +72,9 @@ const SOCIALS = [
         <div class="space-y-2">
           <div class="eyebrow">Developers</div>
           <div class="space-y-1">
-            <div>
-              <a href="https://docs.snapshot.org" target="_blank">
-                Snapshot docs
-                <IH-arrow-sm-right class="inline-block -rotate-45" />
-              </a>
-            </div>
             <div>
               <a href="https://docs.snapshot.box" target="_blank">
-                Snapshot X docs
+                Docs
                 <IH-arrow-sm-right class="inline-block -rotate-45" />
               </a>
             </div>
diff --git a/apps/ui/src/components/Site/Topnav.vue b/apps/ui/src/components/Site/Topnav.vue
index 37448764a..a9553bce1 100644
--- a/apps/ui/src/components/Site/Topnav.vue
+++ b/apps/ui/src/components/Site/Topnav.vue
@@ -25,7 +25,7 @@ const { toggleSkin, currentMode } = useUserSkin();
       <li><AppLink to="/#features">Features</AppLink></li>
       <li><AppLink to="/#ecosystem">Ecosystem</AppLink></li>
       <li>
-        <a href="https://docs.snapshot.org" target="_blank">
+        <a href="https://docs.snapshot.box" target="_blank">
           Developers
           <IH-arrow-sm-right class="inline-block -rotate-45" />
         </a>
diff --git a/apps/ui/src/helpers/turbo.ts b/apps/ui/src/helpers/turbo.ts
index e56128b77..9d07d3d6e 100644
--- a/apps/ui/src/helpers/turbo.ts
+++ b/apps/ui/src/helpers/turbo.ts
@@ -27,6 +27,6 @@ export const MAX_STRATEGIES = {
 };
 
 export const TURBO_URL =
-  'https://docs.snapshot.org/user-guides/spaces/turbo-plan';
+  'https://docs.snapshot.box/user-guides/spaces/turbo-plan';
 export const VERIFIED_URL =
-  'https://docs.snapshot.org/user-guides/spaces/get-verified';
+  'https://docs.snapshot.box/user-guides/spaces/get-verified';

From 3e6b0966a1020b6ca6864647f2a0cfbb49a66818 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 1 Dec 2024 10:59:58 +0800
Subject: [PATCH 57/59] feat: use affix sidebar for editor sidebar (#1002)

---
 apps/ui/src/views/Space/Editor.vue | 327 +++++++++++++++--------------
 1 file changed, 169 insertions(+), 158 deletions(-)

diff --git a/apps/ui/src/views/Space/Editor.vue b/apps/ui/src/views/Space/Editor.vue
index 961cae7d7..10c360cfb 100644
--- a/apps/ui/src/views/Space/Editor.vue
+++ b/apps/ui/src/views/Space/Editor.vue
@@ -375,176 +375,187 @@ watchEffect(() => {
         <IH-paper-airplane class="rotate-90 relative left-[2px]" />
       </UiButton>
     </UiTopnav>
-    <div class="md:mr-[340px]">
-      <UiContainer class="pt-5 !max-w-[710px] mx-0 md:mx-auto s-box">
-        <MessageVotingPower
-          v-if="propositionPower"
-          class="mb-4"
-          :voting-power="propositionPower"
-          action="propose"
-          @fetch-voting-power="handleFetchPropositionPower"
-        />
-        <UiAlert
-          v-if="
-            propositionPower && spaceType === 'default' && proposalLimitReached
-          "
-          type="error"
-          class="mb-4"
-        >
-          <span
-            >Please verify your space to publish more proposals.
-            <a
-              :href="VERIFIED_URL"
-              target="_blank"
-              class="text-rose-500 dark:text-neutral-100 font-semibold"
-              >Verify space</a
-            >.</span
+    <div class="flex items-stretch md:flex-row flex-col w-full md:h-full">
+      <div class="flex-1 grow min-w-0">
+        <UiContainer class="pt-5 !max-w-[710px] mx-0 md:mx-auto s-box">
+          <MessageVotingPower
+            v-if="propositionPower"
+            class="mb-4"
+            :voting-power="propositionPower"
+            action="propose"
+            @fetch-voting-power="handleFetchPropositionPower"
+          />
+          <UiAlert
+            v-if="
+              propositionPower &&
+              spaceType === 'default' &&
+              proposalLimitReached
+            "
+            type="error"
+            class="mb-4"
           >
-        </UiAlert>
-        <UiAlert
-          v-else-if="
-            propositionPower && spaceType !== 'turbo' && proposalLimitReached
-          "
-          type="error"
-          class="mb-4"
-        >
-          <span
-            >You can publish up to {{ MAX_1D_PROPOSALS.verified }} proposals per
-            day and {{ MAX_30D_PROPOSALS.verified }} proposals per month.
-            <a
-              :href="TURBO_URL"
-              target="_blank"
-              class="text-rose-500 dark:text-neutral-100 font-semibold"
-              >Increase limit</a
-            >.</span
+            <span
+              >Please verify your space to publish more proposals.
+              <a
+                :href="VERIFIED_URL"
+                target="_blank"
+                class="text-rose-500 dark:text-neutral-100 font-semibold"
+                >Verify space</a
+              >.</span
+            >
+          </UiAlert>
+          <UiAlert
+            v-else-if="
+              propositionPower && spaceType !== 'turbo' && proposalLimitReached
+            "
+            type="error"
+            class="mb-4"
           >
-        </UiAlert>
-        <UiInputString
-          :key="proposalKey || ''"
-          v-model="proposal.title"
-          :definition="TITLE_DEFINITION"
-          :error="formErrors.title"
-        />
-        <div class="flex space-x-3">
-          <button type="button" @click="previewEnabled = false">
-            <UiLink
-              :is-active="!previewEnabled"
-              text="Write"
-              class="border-transparent"
+            <span
+              >You can publish up to {{ MAX_1D_PROPOSALS.verified }} proposals
+              per day and {{ MAX_30D_PROPOSALS.verified }} proposals per month.
+              <a
+                :href="TURBO_URL"
+                target="_blank"
+                class="text-rose-500 dark:text-neutral-100 font-semibold"
+                >Increase limit</a
+              >.</span
+            >
+          </UiAlert>
+          <UiInputString
+            :key="proposalKey || ''"
+            v-model="proposal.title"
+            :definition="TITLE_DEFINITION"
+            :error="formErrors.title"
+          />
+          <div class="flex space-x-3">
+            <button type="button" @click="previewEnabled = false">
+              <UiLink
+                :is-active="!previewEnabled"
+                text="Write"
+                class="border-transparent"
+              />
+            </button>
+            <button type="button" @click="previewEnabled = true">
+              <UiLink
+                :is-active="previewEnabled"
+                text="Preview"
+                class="border-transparent"
+              />
+            </button>
+          </div>
+          <UiMarkdown
+            v-if="previewEnabled"
+            class="px-3 py-2 border rounded-lg mb-[14px] min-h-[260px]"
+            :body="proposal.body"
+          />
+          <UiComposer
+            v-else
+            v-model="proposal.body"
+            :definition="bodyDefinition"
+            :error="formErrors.body"
+          >
+            <template
+              v-if="
+                !space?.turbo &&
+                isOffchainSpace &&
+                formErrors.body?.startsWith('Must not have more than')
+              "
+              #error-suffix
+            >
+              <a
+                :href="TURBO_URL"
+                target="_blank"
+                class="ml-1 text-skin-danger font-semibold"
+                >Increase limit</a
+              >.
+            </template>
+          </UiComposer>
+          <div class="s-base mb-5">
+            <UiInputString
+              :key="proposalKey || ''"
+              v-model="proposal.discussion"
+              :definition="DISCUSSION_DEFINITION"
+              :error="formErrors.discussion"
             />
-          </button>
-          <button type="button" @click="previewEnabled = true">
-            <UiLink
-              :is-active="previewEnabled"
-              text="Preview"
-              class="border-transparent"
+            <UiLinkPreview
+              :key="proposalKey || ''"
+              :url="proposal.discussion"
             />
-          </button>
-        </div>
-        <UiMarkdown
-          v-if="previewEnabled"
-          class="px-3 py-2 border rounded-lg mb-[14px] min-h-[260px]"
-          :body="proposal.body"
-        />
-        <UiComposer
-          v-else
-          v-model="proposal.body"
-          :definition="bodyDefinition"
-          :error="formErrors.body"
-        >
-          <template
+          </div>
+          <div
             v-if="
-              !space?.turbo &&
-              isOffchainSpace &&
-              formErrors.body?.startsWith('Must not have more than')
+              network &&
+              strategiesWithTreasuries &&
+              strategiesWithTreasuries.length > 0
             "
-            #error-suffix
           >
-            <a
-              :href="TURBO_URL"
-              target="_blank"
-              class="ml-1 text-skin-danger font-semibold"
-              >Increase limit</a
-            >.
-          </template>
-        </UiComposer>
-        <div class="s-base mb-5">
-          <UiInputString
-            :key="proposalKey || ''"
-            v-model="proposal.discussion"
-            :definition="DISCUSSION_DEFINITION"
-            :error="formErrors.discussion"
+            <h4 class="eyebrow mb-2">Execution</h4>
+            <EditorExecution
+              v-for="execution in editorExecutions"
+              :key="execution.address"
+              :model-value="execution.transactions"
+              :disabled="
+                !supportsMultipleTreasuries &&
+                hasExecution &&
+                execution.transactions.length === 0
+              "
+              :space="space"
+              :strategy="execution"
+              :extra-contacts="extraContacts"
+              class="mb-3"
+              @update:model-value="
+                value => handleExecutionUpdated(execution.address, value)
+              "
+            />
+          </div>
+        </UiContainer>
+      </div>
+
+      <Affix
+        :class="['shrink-0 md:w-[340px] border-l-0 md:border-l -mb-6']"
+        :top="72"
+        :bottom="64"
+      >
+        <div class="flex flex-col p-4 space-y-4">
+          <EditorVotingType
+            v-model="proposal"
+            :voting-types="
+              enforcedVoteType ? [enforcedVoteType] : space.voting_types
+            "
           />
-          <UiLinkPreview :key="proposalKey || ''" :url="proposal.discussion" />
-        </div>
-        <div
-          v-if="
-            network &&
-            strategiesWithTreasuries &&
-            strategiesWithTreasuries.length > 0
-          "
-        >
-          <h4 class="eyebrow mb-2">Execution</h4>
-          <EditorExecution
-            v-for="execution in editorExecutions"
-            :key="execution.address"
-            :model-value="execution.transactions"
-            :disabled="
-              !supportsMultipleTreasuries &&
-              hasExecution &&
-              execution.transactions.length === 0
+          <EditorChoices
+            v-model="proposal"
+            :minimum-basic-choices="
+              offchainNetworks.includes(space.network) ? 2 : 3
             "
-            :space="space"
-            :strategy="execution"
-            :extra-contacts="extraContacts"
-            class="mb-3"
-            @update:model-value="
-              value => handleExecutionUpdated(execution.address, value)
+            :definition="choicesDefinition"
+            :error="
+              proposal.choices.length > choicesDefinition.maxItems
+                ? `Must not have more than ${_n(choicesDefinition.maxItems)} items.`
+                : ''
             "
+          >
+            <template v-if="!space?.turbo && isOffchainSpace" #error-suffix>
+              <a
+                :href="TURBO_URL"
+                target="_blank"
+                class="ml-1 text-skin-danger font-semibold"
+                >Increase limit</a
+              >.
+            </template>
+          </EditorChoices>
+          <EditorLabels
+            v-if="space.labels?.length"
+            v-model="proposal.labels"
+            :space="space"
           />
+          <div>
+            <h4 class="eyebrow mb-2.5" v-text="'Timeline'" />
+            <ProposalTimeline :data="space" />
+          </div>
         </div>
-      </UiContainer>
-    </div>
-
-    <div
-      class="static md:fixed md:top-[72px] md:right-0 w-full md:h-[calc(100vh-72px)] md:max-w-[340px] p-4 md:pb-[88px] border-l-0 md:border-l space-y-4 no-scrollbar overflow-y-scroll"
-    >
-      <EditorVotingType
-        v-model="proposal"
-        :voting-types="
-          enforcedVoteType ? [enforcedVoteType] : space.voting_types
-        "
-      />
-      <EditorChoices
-        v-model="proposal"
-        :minimum-basic-choices="
-          offchainNetworks.includes(space.network) ? 2 : 3
-        "
-        :definition="choicesDefinition"
-        :error="
-          proposal.choices.length > choicesDefinition.maxItems
-            ? `Must not have more than ${_n(choicesDefinition.maxItems)} items.`
-            : ''
-        "
-      >
-        <template v-if="!space?.turbo && isOffchainSpace" #error-suffix>
-          <a
-            :href="TURBO_URL"
-            target="_blank"
-            class="ml-1 text-skin-danger font-semibold"
-            >Increase limit</a
-          >.
-        </template>
-      </EditorChoices>
-      <EditorLabels
-        v-if="space.labels?.length"
-        v-model="proposal.labels"
-        :space="space"
-      />
-      <div>
-        <h4 class="eyebrow mb-2.5" v-text="'Timeline'" />
-        <ProposalTimeline :data="space" />
-      </div>
+      </Affix>
     </div>
     <teleport to="#modal">
       <ModalTerms

From 84094bc09bfe468ada798888d5b7df0cc5817749 Mon Sep 17 00:00:00 2001
From: Wan <495709+wa0x6e@users.noreply.github.com>
Date: Sun, 1 Dec 2024 11:00:30 +0800
Subject: [PATCH 58/59] fix: always allow admins and moderators to propose
 (#1007)

* fix: always allow admins and moderators to propose

* fix: add controller to list of team addresses

* fix: remove controller

* fix: allow authors to bypass proposal validation
---
 apps/ui/src/stores/votingPowers.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/stores/votingPowers.ts b/apps/ui/src/stores/votingPowers.ts
index 974a8702b..613796c49 100644
--- a/apps/ui/src/stores/votingPowers.ts
+++ b/apps/ui/src/stores/votingPowers.ts
@@ -1,5 +1,6 @@
 import { utils } from '@snapshot-labs/sx';
 import { defineStore } from 'pinia';
+import { compareAddresses } from '@/helpers/utils';
 import { getNetwork } from '@/networks';
 import { VotingPower, VotingPowerStatus } from '@/networks/types';
 import { Proposal, Space } from '@/types';
@@ -34,6 +35,16 @@ function isSpace(item: SpaceDetails | Proposal): item is Space {
   return 'proposal_threshold' in item;
 }
 
+function isSpaceMember(space: Space, account: string): boolean {
+  return [
+    ...(space.additionalRawData?.admins || []),
+    ...(space.additionalRawData?.moderators || []),
+    ...(space.additionalRawData?.members || [])
+  ]
+    .filter(Boolean)
+    .some(member => compareAddresses(member, account));
+}
+
 export const useVotingPowersStore = defineStore('votingPowers', () => {
   const votingPowers = reactive<Map<string, VotingPowerItem>>(new Map());
 
@@ -103,7 +114,9 @@ export const useVotingPowersStore = defineStore('votingPowers', () => {
       if (isSpace(item) && proposeVp) {
         const totalProposeVp = proposeVp.reduce((acc, b) => acc + b.value, 0n);
 
-        vpItem.canPropose = totalProposeVp >= BigInt(item.proposal_threshold);
+        vpItem.canPropose =
+          totalProposeVp >= BigInt(item.proposal_threshold) ||
+          isSpaceMember(space as Space, account);
       } else {
         vpItem.canVote = vpItem.totalVotingPower > 0n;
       }

From 43dfcb275155521417b30f76edb4a2de48a68ef0 Mon Sep 17 00:00:00 2001
From: Less <bonustrack@users.noreply.github.com>
Date: Sun, 1 Dec 2024 16:37:38 +0700
Subject: [PATCH 59/59] chore: update Lock to v0.2.9 (#1010)

* chore: update Lock to v0.2.9

* fix: remove unrelated lock changes

* fix: update to v0.2.10

* chore: add rounded border for connector icon
---
 apps/ui/package.json                     | 2 +-
 apps/ui/src/components/Modal/Account.vue | 1 +
 yarn.lock                                | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/ui/package.json b/apps/ui/package.json
index 0e51753c4..6dbe296ab 100644
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -47,7 +47,7 @@
     "@openzeppelin/merkle-tree": "^1.0.5",
     "@snapshot-labs/eslint-config-vue": "^0.1.0-beta.18",
     "@snapshot-labs/highlight": "^0.1.0-beta.2",
-    "@snapshot-labs/lock": "^0.2.8",
+    "@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.33",
diff --git a/apps/ui/src/components/Modal/Account.vue b/apps/ui/src/components/Modal/Account.vue
index 8853b3dc5..fce12239e 100644
--- a/apps/ui/src/components/Modal/Account.vue
+++ b/apps/ui/src/components/Modal/Account.vue
@@ -83,6 +83,7 @@ watch(open, () => (step.value = null));
               :src="getConnectorIconUrl(connector.icon)"
               height="28"
               width="28"
+              class="rounded-lg"
               :alt="connector.name"
             />
             {{ connector.name }}
diff --git a/yarn.lock b/yarn.lock
index 41849dc3f..2243896a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2510,10 +2510,10 @@
     "@snapshot-labs/pineapple" "^0.2.0"
     cross-fetch "^3.1.5"
 
-"@snapshot-labs/lock@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/lock/-/lock-0.2.8.tgz#4eb81af37e57c6eac6135e7db3acfbb511e9ab1c"
-  integrity sha512-5Izr4uAIU1lf2CHa155SW4oqZhyndFQf7AQNpyazk0AtffgDmEa6T5KxU7ktRXL9SwuRyAlo7MJrnjxMDmqZWA==
+"@snapshot-labs/lock@^0.2.10":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/lock/-/lock-0.2.10.tgz#82f86eaa04a7579fa15030ceba36aaa537e442fd"
+  integrity sha512-nSSlP6M/KVj+ZEX1OtyM1xsXOsY8e8dX5US9ZWIJGAaqrwPhvl0y/jm1p6gtIuVAcQGo4gCfiBrjLrP8qKA8PQ==
   dependencies:
     "@coinbase/wallet-sdk" "^4.0.4"
     "@portis/web3" "^4.0.6"