Skip to content

Fix total-user-wallets style #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hossein-ab99 merged 2 commits into from
Aug 4, 2024
Merged

Fix total-user-wallets style #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6bd835
Fix total-user-wallets style
Hossein-ab99 Jul 27, 2024
9c8231f
Update github workflows
Hossein-ab99 Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 3 additions & 8 deletions src/pages/ChainAndToken/Chains/ChainBalance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import {BN} from "../../../utils/utils";

const ChainBalance = ({chainId}) => {

console.log("chainId in chainbalance", chainId)

const [params, setParams] = useState({
"excludeZero": false,
});
Expand All @@ -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}`}>
Expand All @@ -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
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ChainAndToken/Chains/Chains.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ChainAndToken/Tokens/Tokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/ChainAndToken/Tokens/TokensBalance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Dashboard/BriefWallet/BriefWalletCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions src/pages/Dashboard/Chain/Chain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/pages/Dashboard/Chain/ChainCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions src/pages/Wallet/walletList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down