Skip to content
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

Jump to bottom

Try to display balance in top bar. #38

Merged
merged 4 commits into from
Sep 14, 2019
Merged

Try to display balance in top bar. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fe4584
Tray (and fail) to display balance in top bar.
JoshOrndorff Sep 12, 2019
3833fdd
Remove state for balance unsubscription. Thanks @Tbaut
JoshOrndorff Sep 13, 2019
9213169
Revert incorrect changes to initial account selection.
JoshOrndorff Sep 13, 2019
c200947
Remove debugging lines
JoshOrndorff Sep 13, 2019
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
50 changes: 43 additions & 7 deletions src/AccountSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import React, { useState, useEffect } from "react";
import { Menu, Dropdown, Container, Icon, Image } from "semantic-ui-react";

export default function NodeInfo(props) {
const { keyring, setAccountAddress } = props;
const { keyring, setAccountAddress, api } = props;
const [accountSelected, setAccountSelected] = useState("");
const [accountBalance, setAccountBalance] = useState(0);

// get the list of accounts we possess the private key for
// Get the list of accounts we possess the private key for
const keyringOptions = keyring.getPairs().map(account => ({
key: account.address,
value: account.address,
Expand All @@ -24,6 +25,31 @@ export default function NodeInfo(props) {
setAccountAddress(initialAddress);
}, [setAccountAddress, initialAddress])

const onChange = (address) => {
// Update state with new account address
setAccountAddress(address);
setAccountSelected(address);
};

// When account address changes, update subscriptions
useEffect(() => {

let unsubscribe;

// If the user has selected an address, create a new subscription
if (accountSelected) {
api.query.balances.freeBalance(accountSelected, (balance) => {
setAccountBalance(balance.toString());
})
.then(u => {
unsubscribe = u;
})
.catch(console.error);
}

return () => unsubscribe && unsubscribe();
}, [accountSelected, api.query.balances]);

return (
<Menu
attached="top"
Expand All @@ -37,8 +63,21 @@ export default function NodeInfo(props) {
>
<Container>
<Menu.Menu>
<Image src='Substrate-Logo.png' size='mini' />
<Image src='Substrate-Logo.png' size='mini' />
</Menu.Menu>
{api.query.balances && accountSelected ?
(
<Menu.Menu>
<Icon
name="money bill alternate outline"
size="large"
circular
></Icon>
{ accountBalance }
</Menu.Menu>
) :
""
}
<Menu.Menu position="right">
<Icon
name="users"
Expand All @@ -52,10 +91,7 @@ export default function NodeInfo(props) {
clearable
placeholder="Select an account"
options={keyringOptions}
onChange={(_, dropdown) => {
setAccountAddress(dropdown.value);
setAccountSelected(dropdown.value);
}}
onChange={(_, dropdown) => { onChange(dropdown.value) }}
value={accountSelected}
/>
</Menu.Menu>
Expand Down
1 change: 1 addition & 0 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export default function App() {
<AccountSelector
keyring={keyring}
setAccountAddress={setAccountAddress}
api={api}
/>
</Sticky>
<Container>
Expand Down