Merge branch 'master' into fix-release-boost-to-public

.env

@@ -10,5 +10,4 @@ VITE_DEFAULT_NETWORK=1
 VITE_PUSHER_BEAMS_INSTANCE_ID=2e080021-d495-456d-b2cf-84f9fd718442
 VITE_SHUTTER_EON_PUBKEY=0x0e6493bbb4ee8b19aa9b70367685049ff01dc9382c46aed83f8bc07d2a5ba3e6030bd83b942c1fd3dff5b79bef3b40bf6b666e51e7f0be14ed62daaffad47435265f5c9403b1a801921981f7d8659a9bd91fe92fb1cf9afdb16178a532adfaf51a237103874bb03afafe9cab2118dae1be5f08a0a28bf488c1581e9db4bc23ca
 VITE_ENV=develop
-VITE_MIXPANEL_TOKEN=2ec6cd1b19e790f45cc9a9bb83980c8d
 VITE_ALCHEMY_API_KEY=ombBQyf580z-jx2EVQgJu4eTjePU-a2z

.eslintrc-auto-import.json

@@ -119,7 +119,6 @@
     "useEmailSubscription": true,
     "useEmailFetchClient": true,
     "useStatement": true,
-    "useMixpanel": true,
     "useBalances": true,
     "useAccount": true,
     "usePayment": true,

FUNDING.json

@@ -3,5 +3,8 @@
     "ethereum": {
       "ownedBy": "0x8C28Cf33d9Fd3D0293f963b1cd27e3FF422B425c"
     }
+  },
+  "opRetro": {
+    "projectId": "0x5e6c436e48e56d6d9622ba5d0be0035c314e2b29d2afc8f5f1ee8ac75cd42532"
   }
 }

package.json

@@ -44,7 +44,7 @@
     "@shutter-network/shutter-crypto": "1.0.1",
     "@snapshot-labs/lock": "^0.2.6",
     "@snapshot-labs/pineapple": "^1.1.0",
-    "@snapshot-labs/snapshot.js": "^0.12.4",
+    "@snapshot-labs/snapshot.js": "^0.12.10",
     "@vue/apollo-composable": "4.0.0-beta.11",
     "@vueuse/core": "^10.6.1",
     "@vueuse/head": "^2.0.0",
@@ -58,7 +58,6 @@
     "kubo-rpc-client": "^3.0.2",
     "lodash": "^4.17.21",
     "minisearch": "^6.2.0",
-    "mixpanel-browser": "^2.48.1",
     "remarkable": "^2.0.1",
     "remove-markdown": "^0.5.0",
     "typescript": "^5.2.2",

src/composables/useClient.ts

@@ -6,7 +6,6 @@ export function useClient() {
   const { notify } = useFlashNotification();
   const { notifyModal } = useModalNotification();
   const { isGnosisSafe } = useGnosis();
-  const { mixpanel } = useMixpanel();
   const { web3 } = useWeb3();
   const auth = getInstance();
   const route = useRoute();
@@ -46,7 +45,7 @@ export function useClient() {
       plugins = payload.metadata.plugins;
 
     if (type === 'create-proposal') {
-      const receipt = await client.proposal(auth.web3, web3.value.account, {
+      return client.proposal(auth.web3, web3.value.account, {
         space: space.id,
         type: payload.type,
         title: payload.name,
@@ -59,36 +58,19 @@ export function useClient() {
         plugins: JSON.stringify(plugins),
         app: DEFINED_APP
       });
-
-      mixpanel.track('Propose', {
-        space: space.id
-      });
-
-      return receipt;
     } else if (type === 'update-proposal') {
-      const receipt = await client.updateProposal(
-        auth.web3,
-        web3.value.account,
-        {
-          proposal: payload.id,
-          space: space.id,
-          type: payload.type,
-          title: payload.name,
-          body: payload.body,
-          discussion: payload.discussion,
-          choices: payload.choices,
-          plugins: JSON.stringify(plugins)
-        }
-      );
-
-      mixpanel.track('Update proposal', {
+      return client.updateProposal(auth.web3, web3.value.account, {
+        proposal: payload.id,
         space: space.id,
-        proposalId: payload.id
+        type: payload.type,
+        title: payload.name,
+        body: payload.body,
+        discussion: payload.discussion,
+        choices: payload.choices,
+        plugins: JSON.stringify(plugins)
       });
-
-      return receipt;
     } else if (type === 'vote') {
-      const receipt = await client.vote(auth.web3, web3.value.account, {
+      return client.vote(auth.web3, web3.value.account, {
         space: space.id,
         proposal: payload.proposal.id,
         type: payload.proposal.type,
@@ -97,74 +79,31 @@ export function useClient() {
         app: DEFINED_APP,
         reason: payload.reason
       });
-
-      mixpanel.track('Vote', {
-        space: space.id,
-        proposalId: payload.proposal.id
-      });
-
-      return receipt;
     } else if (type === 'delete-proposal') {
-      const receipt = await client.cancelProposal(
-        auth.web3,
-        web3.value.account,
-        {
-          space: space.id,
-          proposal: payload.proposal.id
-        }
-      );
-
-      mixpanel.track('Delete proposal', {
+      return client.cancelProposal(auth.web3, web3.value.account, {
         space: space.id,
-        proposalId: payload.proposal.id
+        proposal: payload.proposal.id
       });
-
-      return receipt;
     } else if (type === 'settings') {
-      const receipt = await client.space(auth.web3, web3.value.account, {
+      return client.space(auth.web3, web3.value.account, {
         space: space.id,
         settings: JSON.stringify(payload)
       });
-
-      mixpanel.track('Update space settings', {
-        space: space.id
-      });
-
-      return receipt;
     } else if (type === 'delete-space') {
-      const receipt = await client.deleteSpace(auth.web3, web3.value.account, {
+      return client.deleteSpace(auth.web3, web3.value.account, {
         space: space.id
       });
-
-      mixpanel.track('Delete space', {
-        space: space.id
-      });
-
-      return receipt;
     } else if (type === 'set-statement') {
-      const receipt = await client.statement(auth.web3, web3.value.account, {
+      return client.statement(auth.web3, web3.value.account, {
         space: space.id,
         about: payload.about,
         statement: payload.statement
       });
-
-      mixpanel.track('Set statement', {
-        space: space.id
-      });
-
-      return receipt;
     } else if (type === 'flag-proposal') {
-      const receipt = await client.flagProposal(auth.web3, web3.value.account, {
+      return client.flagProposal(auth.web3, web3.value.account, {
         space: space.id,
         proposal: payload.proposal.id
       });
-
-      mixpanel.track('Flag proposal', {
-        space: space.id,
-        proposalId: payload.proposal.id
-      });
-
-      return receipt;
     }
   }
 

src/locales/default.json

@@ -932,10 +932,6 @@
       }
     }
   },
-  "hal": {
-    "title": "Track proposals for {spaceName}",
-    "text": "Receive notifications every time a {space} proposal is created or ends"
-  },
   "domino": {
     "title": "Automations",
     "information": "Create automated workflows with just a single click using Domino.",

src/router/index.ts

@@ -1,5 +1,4 @@
 import { createRouter, createWebHashHistory, RouteLocation } from 'vue-router';
-import { useMixpanel } from '@/composables/useMixpanel';
 
 import DelegateView from '@/views/DelegateView.vue';
 import ExploreView from '@/views/ExploreView.vue';
@@ -29,7 +28,6 @@ import TermsView from '@/views/TermsView.vue';
 // The frontend shows all spaces or just a single one, when being accessed
 // through that space's custom domain.
 const { domain, domainAlias } = useApp();
-const { mixpanel } = useMixpanel();
 
 const routes: any[] = [];
 
@@ -189,13 +187,6 @@ const router = createRouter({
   }
 });
 
-router.afterEach(to => {
-  mixpanel.track_pageview({
-    page_name: to.name,
-    page_path: to.path
-  });
-});
-
 export { routes };
 
 export default router;

src/views/Network.vue

@@ -49,6 +49,16 @@ const CUSTOMERS = [
     avatar:
       'ipfs://bafkreia7lrda6v2fc5dthazn3qdost4yd2qrn3r4ntrd6lgmc2gvtvvhoa',
     website: 'https://gravity.xyz'
+  },
+  {
+    name: 'zkLink',
+    avatar: 'bafkreic6c3iems5235qapyhyrygha7akqrsfact2nok3y2uhljpzxrdu74',
+    website: 'https://zklink.io'
+  },
+  {
+    name: 'Fantom',
+    avatar: 'ipfs://QmVEgNeQDKnXygeGxfY9FywZpNGQu98ktZtRJ9bToYF6g7',
+    website: 'https://fantom.foundation'
   }
 ];
 const FAQ = [

yarn.lock

@@ -1721,10 +1721,10 @@
   resolved "https://registry.yarnpkg.com/@snapshot-labs/prettier-config/-/prettier-config-0.1.0-beta.15.tgz#07e5ae35ed36304250462218e115bab1c1609812"
   integrity sha512-va6zYSl8oIraBJeIZWEatOI292rfJQouyyvEeHv8qi9ns+LgxMsKayQtXSqn9GcmAfdWQVs/P9bDaCQ77FyJYw==
 
-"@snapshot-labs/snapshot.js@^0.12.4":
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.4.tgz#d2cf1e2bb04714638f3b746bb212f9d93d2ab624"
-  integrity sha512-O9qxZ3qzH2CDBiMDGX4orQIFYKLKJMvpoF8uMsRhWVnp/CiH1eu5obxJCzys2n4o6KvvgtDQjS45b+7mh/85gA==
+"@snapshot-labs/snapshot.js@^0.12.10":
+  version "0.12.10"
+  resolved "https://registry.yarnpkg.com/@snapshot-labs/snapshot.js/-/snapshot.js-0.12.10.tgz#69880cec8546fd271c1ede15134906ab2625e78f"
+  integrity sha512-NNypHVuNd9xsbAA/oGLntBMfVA7TfT2ARygVJ+zqmmgvkeofkoGi9u0bCXRqXWSyylP8tfvtkPQ9eFVGk4U1RQ==
   dependencies:
     "@ensdomains/eth-ens-namehash" "^2.0.15"
     "@ethersproject/abi" "^5.6.4"
@@ -6757,11 +6757,6 @@ minisearch@^6.2.0:
   resolved "https://registry.yarnpkg.com/minisearch/-/minisearch-6.2.0.tgz#310b50508551f22e10815f5baedeeeded03a6b5d"
   integrity sha512-BECkorDF1TY2rGKt9XHdSeP9TP29yUbrAaCh/C03wpyf1vx3uYcP/+8XlMcpTkgoU0rBVnHMAOaP83Rc9Tm+TQ==
 
-mixpanel-browser@^2.48.1:
-  version "2.48.1"
-  resolved "https://registry.yarnpkg.com/mixpanel-browser/-/mixpanel-browser-2.48.1.tgz#0fec03d87f57fe2e72c6a4b1df5924436840ece7"
-  integrity sha512-vXTuUzZMg+ht7sRqyjtc3dUDy/81Z/H6FLFgFkUZJqKFaAqcx1JSXmOdY/2kmsxCkUdy5JN5zW9m9TMCk+rxGQ==
-
 mlly@^1.1.1, mlly@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.2.0.tgz#f0f6c2fc8d2d12ea6907cd869066689b5031b613"