Skip to content

feat: display pools if wallet not connected #104

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

Open
anukulpandey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: display pools if wallet not connected #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ useEffect(()=>{
}
}

const {isAccountSelectorOpen} = useAccountSelector()

// @ts-ignore
return (
<>
Expand Down
6 changes: 3 additions & 3 deletions src/common/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ const Nav = ({ selectExtension }: Nav): JSX.Element => {
{ title: localizedStrings.bonds, url: BONDS_URL },
];
if (isReefswapUI) {
menuItems = [
menuItems = selectedSigner?[
{ title: localizedStrings.tokens_pill, url: DASHBOARD_URL },
{ title: localizedStrings.pools, url: POOLS_URL },
{ title: localizedStrings.creator, url: CREATE_ERC20_TOKEN_URL },
];
]:[{ title: localizedStrings.pools, url: POOLS_URL }];
}

const hideBalance = useContext(HideBalance);
Expand Down Expand Up @@ -175,7 +175,7 @@ const Nav = ({ selectExtension }: Nav): JSX.Element => {
</button>

<nav className="d-flex justify-content-end d-flex-vert-center">
{selectedSigner && <ul className="navigation_menu-items ">
{<ul className="navigation_menu-items ">
{menuItemsView}
</ul>}

Expand Down
11 changes: 11 additions & 0 deletions src/pages/dashboard/Dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,3 +442,14 @@
padding-bottom: 0.5em;
padding-top: 0.8em;
}

.reef-swap-ui-btn-group{
margin-top: 1rem;
display: flex;
align-items: center;
justify-content: center;
}

.mr-1{
margin-right: 1rem;
}
89 changes: 53 additions & 36 deletions src/pages/dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ import { localizedStrings } from '../../l10n/l10n';
import GetReefTestnetButton from './GetReefTestnetButton';
import ReefSigners from '../../context/ReefSigners';
import useAccountSelector from '../../hooks/useAccountSelector';
import { useHistory } from 'react-router-dom';
import { POOLS_URL } from '../../urls';

const Dashboard = (): JSX.Element => {
const history = useHistory();
const { network } = useContext(ReefSigners);
const { nfts } = useContext(NftContext);
const { selectedSigner} = useContext(ReefSigners);
const {setIsAccountSelectorOpen} = useAccountSelector();
const { selectedSigner } = useContext(ReefSigners);
const { setIsAccountSelectorOpen } = useAccountSelector();
const tabs = (() => [
{ value: 'tokens', text: localizedStrings.tokens_pill || 'Tokens' },
{ value: 'bonds', text: localizedStrings.bonds || 'Bonds' },
Expand All @@ -42,49 +45,63 @@ const Dashboard = (): JSX.Element => {
),
new BigNumber(0),
).toNumber(),
[tokenPrices, tokens]);
[tokenPrices, tokens]);

return (
selectedSigner?
<div className="dashboard">
<div className="dashboard__top">
<div className="dashboard__top-left">
<Balance balance={totalBalance} loading={loading} />
{/* <Rewards rewards={0} /> */}
selectedSigner ?
<div className="dashboard">
<div className="dashboard__top">
<div className="dashboard__top-left">
<Balance balance={totalBalance} loading={loading} />
{/* <Rewards rewards={0} /> */}
</div>
<div className="dashboard__top-right">
{network?.name !== nw.AVAILABLE_NETWORKS.mainnet.name && <GetReefTestnetButton />}
{network?.name === nw.AVAILABLE_NETWORKS.mainnet.name && <BuyReefButton />}
</div>
</div>
<div className="dashboard__top-right">
{network?.name !== nw.AVAILABLE_NETWORKS.mainnet.name && <GetReefTestnetButton />}
{network?.name === nw.AVAILABLE_NETWORKS.mainnet.name && <BuyReefButton />}
</div>
</div>

<div className="dashboard__main">
<div className="dashboard__left">
<div className="dashboard__main">
<div className="dashboard__left">

{!isReefswapUI && (
<Uik.Tabs
className="dashboard__tabs "
options={tabs}
value={tab}
onChange={(e) => setTab(e)}
/>
)}
{isReefswapUI && (<Uik.Text type="title" text="Tokens" className="tokens__title" />)}
{!isReefswapUI && (
<Uik.Tabs
className="dashboard__tabs "
options={tabs}
value={tab}
onChange={(e) => setTab(e)}
/>
)}
{isReefswapUI && (<Uik.Text type="title" text="Tokens" className="tokens__title" />)}

{ tab === 'tokens' ? <TokenBalances tokens={tokens} /> : '' }
{ tab === 'bonds' ? <Staking /> : '' }
{ tab === 'nfts' ? <Nfts nfts={nfts} /> : '' }
</div>
{tab === 'tokens' ? <TokenBalances tokens={tokens} /> : ''}
{tab === 'bonds' ? <Staking /> : ''}
{tab === 'nfts' ? <Nfts nfts={nfts} /> : ''}
</div>

<div className="dashboard__right">
<Activity />
<div className="dashboard__right">
<Activity />
</div>
</div>
</div>
</div>:<div className='no-account-dashboard'>
<Uik.Text text="No account selected" type="light" className="mb-2"/>
<Uik.Button text="Select Account" onClick={()=>setIsAccountSelectorOpen(true)} fill/>
</div> : <div className='no-account-dashboard'>
{isReefswapUI ?
<>
<div>
<Uik.Text text="Wallet is not connected, Navigate to Pools or Connect Wallet" type="light" className="mb-2" />
<div className='reef-swap-ui-btn-group'>
<Uik.Button text="Open Pools" className="mr-1" onClick={() => history.push(POOLS_URL)} />
<Uik.Button text="Connect Wallet" onClick={() => setIsAccountSelectorOpen(true)} fill />
</div>
</div>
</>
:
<>
<Uik.Text text="No account selected" type="light" className="mb-2" />
<Uik.Button text="Select Account" onClick={() => setIsAccountSelectorOpen(true)} fill />
</>
}

</div>
</div>
);
};

Expand Down
20 changes: 13 additions & 7 deletions src/pages/pools/Pool/Actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
Components, hooks, store, Token,
Components, hooks, ReefSigner, store, Token,
} from '@reef-chain/react-lib';
import Uik from '@reef-chain/ui-kit';
import React, {
Expand Down Expand Up @@ -205,9 +205,10 @@ const Actions = ({ token1, token2, tab }: ActionsProps): JSX.Element => {

interface ActionsWrapperProps extends ActionsProps {
poolAddress: string;
signer:ReefSigner | undefined
}
const ActionsWrapper = ({
token1, token2, poolAddress, tab,
token1, token2, poolAddress, tab,signer
}: ActionsWrapperProps): JSX.Element => {
const history = useHistory();

Expand All @@ -219,17 +220,22 @@ const ActionsWrapper = ({
);
};

const getOptions = ()=>{
if(!signer)return [{ value: 'trade', text: 'Trade' },]
return [
{ value: 'trade', text: 'Trade' },
{ value: 'stake', text: 'Stake' },
{ value: 'unstake', text: 'Unstake' },
]
}

return (
<div className="uik-pool-actions pool-actions">
<div className="uik-pool-actions__top">
<Uik.Tabs
value={tab}
onChange={(value) => selectTab(value)}
options={[
{ value: 'trade', text: 'Trade' },
{ value: 'stake', text: 'Stake' },
{ value: 'unstake', text: 'Unstake' },
]}
options={getOptions()}
/>
</div>
<Actions
Expand Down
1 change: 1 addition & 0 deletions src/pages/pools/Pool/Pool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ const Pool = (): JSX.Element => {
balance: BigNumber.from(0),
decimals: decimals2,
}}
signer={signer}
/>
<Chart
tokens={{
Expand Down