Merge branch 'develop' into feature/e2e-test-friendly

aragon · Jan 16, 2025 · 35a70d4 · 35a70d4
2 parents a0618ff + 1aa86e2
commit 35a70d4
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 57 deletions.
diff --git a/.github/fleek/production.json b/.github/fleek/production.json
@@ -1,14 +1,8 @@
 {
-  "site": {
-    "id": "81492921-4a99-4f5d-bd34-aa01ba6a1504",
-    "team": "aragonone-team",
-    "platform": "ipfs",
-    "source": "ipfs",
-    "name": "apparagonorg"
-  },
-  "build": {
-    "baseDir": "",
-    "publicDir": "dist",
-    "rootDir": ""
-  }
-}
+  "sites": [
+    {
+      "slug": "apparagonorg",
+      "distDir": "dist"
+    }
+  ]
+}
diff --git a/.github/fleek/staging.json b/.github/fleek/staging.json
@@ -1,14 +1,8 @@
 {
-  "site": {
-    "id": "05c463ec-bd57-492b-a89b-adad25df6e83",
-    "team": "aragonone-team",
-    "platform": "ipfs",
-    "source": "ipfs",
-    "name": "floral-forest-6918"
-  },
-  "build": {
-    "baseDir": "",
-    "publicDir": "dist",
-    "rootDir": ""
-  }
+  "sites": [
+    {
+      "slug": "floral-forest-6918",
+      "distDir": "dist"
+    }
+  ]
 }
diff --git a/.github/workflows/webapp-deploy.yml b/.github/workflows/webapp-deploy.yml
@@ -64,15 +64,19 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         run: yarn sentry:sourcemaps
 
+      - name: Install Fleek CLI
+        run: npm i -g @fleek-platform/cli
       - name: Activate Fleek
         env:
           FLEEK_FILE: ${{ needs.set-environment.outputs.environment }}
-        run: mv ./.github/fleek/$FLEEK_FILE.json .fleek.json
-      - name: Deploy through Fleek
+        run: mv ./.github/fleek/$FLEEK_FILE.json fleek.config.json
+      - name: Deploy on Fleek
         id: deploy
-        uses: fleekhq/action-deploy@v1.0.1
-        with:
-          apiKey: ${{ secrets.FLEEK_API_KEY }}
-          workDir: ${{ env.working-directory }}
+        run: fleek sites deploy
+        env:
+          FLEEK_TOKEN: ${{ secrets.FLEEK_TOKEN_2 }}
+          FLEEK_PROJECT_ID: ${{ secrets.FLEEK_PROJECT_ID_2 }}
+
+
       - name: Get the Fleek output url
         run: echo "The Fleek deploy url is ${{ steps.deploy.outputs.deployUrl }}"
diff --git a/src/assets/data/featured-daos.json b/src/assets/data/featured-daos.json
@@ -15,10 +15,18 @@
     "daoAddress": "0x0000000000000000000000000000000000000000",
     "overrideUrl": "https://governance.polygon.technology/"
   },
+  {
+    "name": "Taiko DAO",
+    "description": "Taiko DAO gives token holders and delegates onchain veto rights to secure the Taiko based rollup.",
+    "logo": "https://pbs.twimg.com/profile_images/1823377013186691072/jPGLrNT0_400x400.png",
+    "network": "ethereum",
+    "daoAddress": "0x0000000000000000000000000000000000000000",
+    "overrideUrl": "https://hekla.dao.taiko.xyz/"
+  },
   {
     "name": "Puffer DAO",
     "description": "Puffer DAO enables the community and its ecosystem participants to govern the Puffer protocol.",
-    "logo": "https://pbs.twimg.com/profile_images/1816010238262444033/ccrQWNFq_400x400.jpg",
+    "logo": "https://pbs.twimg.com/profile_images/1874641749865607169/08edgUL-_400x400.jpg",
     "network": "ethereum",
     "daoAddress": "0x5dea8e499b05de8f86e7521f039770268055b23f",
     "overrideUrl": "https://vote.puffer.fi/"
@@ -48,18 +56,10 @@
     "overrideUrl": "https://app.morpho.org/vault?vault=0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB"
   },
   {
-    "name": "Openmesh",
-    "description": "Openmesh's OpenR&D is open-source platform designed to empower decentralized teams to collaborate seamlessly.",
-    "logo": "https://pbs.twimg.com/profile_images/1796530693314424833/PfW0xFlD_400x400.jpg",
-    "network": "polygon",
-    "daoAddress": "0x053a28A9Ffd76253379759df5e5b41466cD13804",
-    "overrideUrl": "https://ovc.openmesh.network/plugins/token-voting/"
-  },
-  {
-    "name": "Aragon X",
-    "description": "The Aragon X team is dogfooding their latest governance stack - the most modular governance stack on Ethereum.",
-    "logo": "https://pbs.twimg.com/profile_images/1643537212095733761/zMvurGOa_400x400.jpg",
+    "name": "Aragon Foundation",
+    "description": "Onchain asset management to empower developers to build open source technology for onchain governance.",
+    "logo": "https://pbs.twimg.com/profile_images/1851934141782331394/Z0ZqlyIo_400x400.png",
     "network": "ethereum",
-    "daoAddress": "0xdafbd7d63cee88d73a51592b42f27f7fd6ab7722"
+    "daoAddress": "0xb2ecff866c75c640f335afbe5b09d5b03d464362"
   }
 ]
diff --git a/src/containers/voteOrApprovalDialog/hooks/useSendVoteOrApprovalTransaction.ts b/src/containers/voteOrApprovalDialog/hooks/useSendVoteOrApprovalTransaction.ts
@@ -22,6 +22,7 @@ import {GaslessVotingProposal} from '@vocdoni/gasless-voting';
 import {ProposalStatus} from '@aragon/sdk-client-common';
 import {useDaoDetailsQuery} from 'hooks/useDaoDetails';
 import {useDaoToken} from 'hooks/useDaoToken';
+import {TransactionReceipt} from 'viem';
 
 export interface IUseSendVoteOrApprovalTransaction {
   /**
@@ -90,17 +91,21 @@ export const useSendVoteOrApprovalTransaction = (
     }
   );
 
-  const handleVoteOrApprovalSuccess = () => {
+  const handleVoteOrApprovalSuccess = (txReceipt: TransactionReceipt) => {
+    // Use address from transaction receipt for caching the vote as user can
+    // switch address after approving the transaction
+    const userAddress = txReceipt.from.toLowerCase();
+
     setVoteOrApprovalSubmitted(true);
 
     switch (pluginType) {
       case 'token-voting.plugin.dao.eth': {
         // cache token-voting vote
-        if (address != null && votingPower && vote) {
+        if (votingPower && vote) {
           // fetch token user balance, ie vote weight
           try {
             const voteToPersist = {
-              address: address.toLowerCase(),
+              address: userAddress,
               vote: vote,
               weight: votingPower.toBigInt(),
               voteReplaced: !!replacingVote,
@@ -119,13 +124,11 @@ export const useSendVoteOrApprovalTransaction = (
         break;
       }
       case 'multisig.plugin.dao.eth': {
-        if (address) {
-          voteStorage.addVote(
-            CHAIN_METADATA[network].id,
-            proposalId,
-            address.toLowerCase()
-          );
-        }
+        voteStorage.addVote(
+          CHAIN_METADATA[network].id,
+          proposalId,
+          userAddress
+        );
         break;
       }
       case 'vocdoni-gasless-voting-poc-vanilla-erc20.plugin.dao.eth': {

diff --git a/yarn.lock b/yarn.lock
@@ -9407,9 +9407,9 @@ nanoclone@^0.2.1:
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
 nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 napi-wasm@^1.1.0:
   version "1.1.0"