Merge pull request #28 from opexdev/develop

Hossein-ab99 · web-flow · commit d1c9f9f98a31 · 2024-08-04T18:48:41.000+03:30
Fix total-user-wallets style
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -17,12 +17,12 @@ jobs:
       - name: Build Docker images
         env:
           GENERATE_SOURCEMAP: ''
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,12 +17,12 @@ jobs:
       - name: Build Docker images
         env:
           GENERATE_SOURCEMAP: false
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -15,4 +15,4 @@ jobs:
         env:
           TAG: latest
           GENERATE_SOURCEMAP: false
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
diff --git a/src/pages/ChainAndToken/Chains/ChainBalance.js b/src/pages/ChainAndToken/Chains/ChainBalance.js
@@ -8,8 +8,6 @@ import {BN} from "../../../utils/utils";
 
 const ChainBalance = ({chainId}) => {
 
-    console.log("chainId in chainbalance", chainId)
-
     const [params, setParams] = useState({
         "excludeZero": false,
     });
@@ -22,9 +20,6 @@ const ChainBalance = ({chainId}) => {
         refetch()
     }, [params]);
 
-
-    console.log("data ChainBalance", data)
-
     const content = ()=> {
 
         if (isLoading) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
@@ -49,8 +44,8 @@ const ChainBalance = ({chainId}) => {
 
         <>
 
-            <div className={`col-12 my-2 d-flex flex-row justify-content-between col-12 mt-4 py-4 px-4 ${classes.box}`}>
-               <div className={`d-flex flex-row col-5`}>
+            <div className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
+               <div className={`d-flex flex-row align-items-center col-5`}>
                    <span className={``}>Exclude Zero Balance</span>
                    <span className={`mx-2`}> </span>
                    <ToggleSwitch
@@ -72,7 +67,7 @@ const ChainBalance = ({chainId}) => {
                        checked={params?.excludeZero}/>
                </div>
 
-                <div className={`d-flex flex-row justify-content-center col-7 text-center`}>
+                <div className={`d-flex flex-row justify-content-center align-items-center col-7 text-center`}>
                     <span className={``}>{total?.chain?.toUpperCase()}</span>
                     <span className={`mx-1`}> </span>
                     <span className={``}>Total Balance: </span>
diff --git a/src/pages/ChainAndToken/Chains/Chains.js b/src/pages/ChainAndToken/Chains/Chains.js
@@ -23,7 +23,7 @@ const Chains = () => {
         if (error) return <span>Error</span>
         if (isLoading) return <span>Loading...</span>
         else return <>
-            <div className={`d-flex flex-row `}>
+            <div className={`d-flex flex-row font-size-sm`}>
                 {data?.map((chain, index) => <span key={index} className={`${classes.chainTitle} ${chain?.id === chainId && classes.activeChain}`} onClick={()=>setChainId(chain?.id)}>{chain?.name}</span>)}
 
             </div>
diff --git a/src/pages/ChainAndToken/Tokens/Tokens.js b/src/pages/ChainAndToken/Tokens/Tokens.js
@@ -20,7 +20,7 @@ const Tokens = () => {
         if (error) return <span>Error</span>
         if (isLoading) return <span>Loading...</span>
         else return <>
-            <div className={`d-flex flex-row `}>
+            <div className={`d-flex flex-row font-size-sm`}>
                 {data?.map((chain, index) => <span key={index} className={`${classes.chainTitle} ${chain?.id === chainId && classes.activeChain}`} onClick={()=>setChainId(chain?.id)}>{chain?.name}</span>)}
 
             </div>
diff --git a/src/pages/ChainAndToken/Tokens/TokensBalance.js b/src/pages/ChainAndToken/Tokens/TokensBalance.js
@@ -44,8 +44,8 @@ const TokensBalance = ({chainId}) => {
     return (
         <>
 
-            <div className={`col-12 my-2 d-flex flex-row justify-content-between col-12 mt-4 py-4 px-4 ${classes.box}`}>
-                <div className={`d-flex flex-row col-5`}>
+            <div className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
+                <div className={`d-flex flex-row align-items-center col-5`}>
                     <span className={``}>Exclude Zero Balance</span>
                     <span className={`mx-2`}> </span>
                     <ToggleSwitch
@@ -67,7 +67,7 @@ const TokensBalance = ({chainId}) => {
                         checked={params?.excludeZero}/>
                 </div>
 
-                <div className={`d-flex flex-row justify-content-center col-7 text-center`}>
+                <div className={`d-flex flex-row justify-content-center align-items-center col-7 text-center`}>
                     <span className={``}>{total?.chain?.toUpperCase()}</span>
                     <span className={`mx-1`}> </span>
                     <span className={``}>Total Balance: </span>
diff --git a/src/pages/Dashboard/BriefWallet/BriefWalletCard.js b/src/pages/Dashboard/BriefWallet/BriefWalletCard.js
@@ -4,7 +4,7 @@ import {BN} from "../../../utils/utils";
 
 const BriefWalletCard = ({data, index}) => {
     return (
-        <div key={index} className={`d-flex flex-row justify-content-between align-items-center py-3 px-4`}>
+        <div key={index} className={`d-flex flex-row justify-content-between align-items-center py-3 px-4 font-size-sm`}>
             <span className={`col-4`}>{data?.currency}</span>
             <span className={`col-8`}>{new BN(data?.balance).toFormat()}</span>
         </div>
diff --git a/src/pages/Dashboard/Chain/Chain.js b/src/pages/Dashboard/Chain/Chain.js
@@ -8,10 +8,6 @@ const Chain = () => {
 
     const {data, isLoading, error} = useGetTotalBalance();
 
-
-    console.log("data,", data )
-
-
     const content = () => {
         if (error) return <span>Error</span>
         if (isLoading) return <span>Loading...</span>
diff --git a/src/pages/Dashboard/Chain/ChainCard.js b/src/pages/Dashboard/Chain/ChainCard.js
@@ -4,8 +4,6 @@ import {BN} from "../../../utils/utils";
 
 const ChainCard = ({data, index}) => {
 
-    console.log("data in", data)
-
     return (
         <div key={index} className={`d-flex flex-row justify-content-between align-items-center py-3 px-4 font-size-sm`}>
             <span className={`col-4`}>{data?.chain}</span>
diff --git a/src/pages/Wallet/walletList.js b/src/pages/Wallet/walletList.js
@@ -2,10 +2,6 @@ import React from 'react';
 import classes from './Wallet.module.css'
 
 const walletList = (data, index) => {
-
-    console.log("data in list", data)
-
-
     let head = (
         <div className="flex-row justify-content-between col-12 text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
             <span className="width-5 flex jc-start ai-center">Name</span>
