Merge pull request #54 from gnosischain/main

backport changes to dev
gnosischain · Aug 14, 2024 · 1ebb063 · 1ebb063
2 parents 5c02cf8 + d4dc12b
commit 1ebb063
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml
@@ -54,15 +54,17 @@ jobs:
               run: yarn update-deposits && yarn build
 
             - name: Install Playwright Browsers
-              run: yarn playwright install
+              run: |
+                yarn add playwright --dev
+                yarn playwright install
 
             - name: Setup xvfb
               run: |
                 sudo apt-get update
                 sudo apt-get install -y xvfb
 
-            - name: Run tests
-              run: xvfb-run --auto-servernum --server-args='-screen 0, 1920x1080x24' yarn run-e2e-tests
+            # - name: Run tests
+            #   run: xvfb-run --auto-servernum --server-args='-screen 0, 1920x1080x24' yarn run-e2e-tests
 
             - name: Configure AWS Production credentials
               uses: aws-actions/configure-aws-credentials@v1
@@ -94,4 +96,4 @@ jobs:
         service: GC Deposit UI
         success: ${{ contains(join(needs.*.result, ','), 'success') }}
         message: "deploy service `GC Deposit UI` version `${{ inputs.tag }}`. Triggered by `${{ github.actor }}`."
-
+
diff --git a/hooks/use-dappnode-deposit.ts b/hooks/use-dappnode-deposit.ts
@@ -163,7 +163,7 @@ function useDappnodeDeposit(contractConfig: ContractNetwork | undefined, address
 
       return { deposits: newDeposits, hasDuplicates, _isBatch };
     },
-    [address, contractConfig, deposits]
+    [address, contractConfig, deposits, user]
   );
 
   const setDappnodeDepositData = useCallback(
@@ -202,9 +202,15 @@ function useDappnodeDeposit(contractConfig: ContractNetwork | undefined, address
             deposit_data_roots: string[]
         } = {pubkeys:'',signatures:'',deposit_data_roots:[]};
 
-        deposits.forEach((deposit) => {
-          data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey : `0x${deposit.pubkey}`;
-          data.signatures += deposit.signature.startsWith('0x') ? deposit.signature : `0x${deposit.signature}`;
+        deposits.forEach((deposit, i) => {
+          if (i === 0) {
+            data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey : `0x${deposit.pubkey}`;
+            data.signatures += deposit.signature.startsWith('0x') ? deposit.signature : `0x${deposit.signature}`;
+          } else {
+            data.pubkeys += deposit.pubkey.startsWith('0x') ? deposit.pubkey.slice(2) : deposit.pubkey;
+            data.signatures += deposit.signature.startsWith('0x') ? deposit.signature.slice(2) : deposit.signature;
+          }
+
           data.deposit_data_roots.push(deposit.deposit_data_root.startsWith('0x') ? deposit.deposit_data_root : `0x${deposit.deposit_data_root}`);
         });