Merge pull request #192 from chain4travel/suite

chore: update balance calculation in XAddressDetail.tsx and Docker Compose command syntax
chain4travel · Aug 19, 2024 · 82a48f9 · 82a48f9
2 parents 521d1d2 + 63299bf
commit 82a48f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -37,10 +37,10 @@ jobs:
 
       - name: build local image
         run: |
-          docker-compose build --build-arg SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }} --build-arg WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
+          docker compose build --build-arg SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }} --build-arg WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
           export SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }}
           export WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
-          docker-compose up -d
+          docker compose up -d
           docker cp camino-suite-host-container:/app/camino-suite ./
           mkdir -p /home/runner/.cache
           docker cp camino-suite-host-container:/root/.cache/Cypress  /home/runner/.cache/
@@ -100,10 +100,10 @@ jobs:
 
       - name: build local image
         run: |
-          docker-compose build --build-arg SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }} --build-arg WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
+          docker compose build --build-arg SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }} --build-arg WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
           export SUITE_IMAGE=${{ env.suite_image }}:${{ steps.setBranch.outputs.branch }}
           export WALLET_IMAGE=${{ env.wallet_image }}:${{ steps.setBranch.outputs.branch }}
-          docker-compose up -d
+          docker compose up -d
           docker cp camino-suite-host-container:/app/camino-suite ./
           mkdir -p /home/runner/.cache
           docker cp camino-suite-host-container:/root/.cache/Cypress  /home/runner/.cache/

diff --git a/src/app/pages/XChainPages/Address/XAddressDetail.tsx b/src/app/pages/XChainPages/Address/XAddressDetail.tsx
@@ -72,7 +72,14 @@ export default function XAddressDetail() {
                     symbol: assets.get(key)?.symbol || 'UNKNOWN',
                 })
             })
-            setBalance(addressBalances[0]?.balance)
+
+            let totalBalance = 0
+            addressBalances.forEach((element: AddressBalance) => {
+                totalBalance += +element.balance
+            })
+
+            setBalance(totalBalance)
+
             return addressBalances
         }
         return []
@@ -151,4 +158,4 @@ export const AddressOverviewCard = ({ balance }: { balance: number }) => {
             </Box>
         </Paper>
     )
-}
+}