Skip to content

feat(augmintToken): add etheur rate to the top of stability board #686

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
rszaloki merged 11 commits into from
Jul 23, 2019
Merged

feat(augmintToken): add etheur rate to the top of stability board #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29af99e
feat(augmintToken): add etheur rate to the top of stability board
admrid Jul 4, 2019
b5da0a8
fix(augmintToken): add padding
admrid Jul 4, 2019
9cc0c32
feat(rates): add lastUpdated to store & show on /stability
admrid Jul 5, 2019
67003a1
feat(augmintToken): add last updated text
admrid Jul 5, 2019
c9a64c2
feat(augmintToken): make styling consistent
admrid Jul 5, 2019
cbc2733
feat(augmintToken): change time format to relative
admrid Jul 5, 2019
b80f0ab
fix(augmintToken): add logic to show time only when available
admrid Jul 5, 2019
219d943
style(augmintToken): remove unused comps
admrid Jul 5, 2019
1a4d3fc
fix(augmintToken): add minor style changes
admrid Jul 5, 2019
55b73b6
fix(augmintToken): add minor style changes
admrid Jul 5, 2019
31855b6
fix(augmintToken): add minor style changes
admrid Jul 5, 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
26 changes: 26 additions & 0 deletions src/containers/augmintToken/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { ErrorPanel } from "components/MsgPanels";
import Segment from "components/augmint-ui/segment";
import Button from "components/augmint-ui/button";
import { AEUR, ETH, Percent } from "components/augmint-ui/currencies";
import moment from "moment";

import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol } from "./styles";
import theme from "styles/theme";
Expand Down Expand Up @@ -51,6 +52,10 @@ class AugmintToken extends React.Component {
const ethReservesError = monetarySupervisor.loadError || metrics.error;
const stabilityRatiosError = rates.loadError || metrics.error || monetarySupervisor.loadError;

const ratesSinceLastUpdated =
rates.info.lastUpdated &&
moment(new Date(rates.info.lastUpdated).toLocaleString(), "DDMMYYYY, hh:mm:ss").fromNow();

if (Object.keys(metrics.loansData).length) {
bn_loansCollected = metrics.loansData.bn_collectedLoansAmount.plus(
metrics.loansData.bn_defaultedLoansAmount
Expand Down Expand Up @@ -210,6 +215,27 @@ class AugmintToken extends React.Component {
<TopNavTitlePortal>
<Pheader header="Stability Report" />
</TopNavTitlePortal>
<Segment loading={rates.isLoading} style={{ color: "black" }}>
<StyledHeader as="h3">Rates feed</StyledHeader>
<StyledMyListGroup>
<StyledRow>
<StyledCol width={{ tablet: 1, desktop: 3 / 5, giant: 2 / 5 }}>
<MyListGroup>
<StyledRow halign="justify" style={{ alignItems: "start" }}>
<StyledCol width={2 / 3}>
1 ETH
<br />
<small style={{ color: theme.colors.mediumGrey }}>
Last updated: {ratesSinceLastUpdated}
</small>
</StyledCol>
<StyledCol width={1 / 3}>{rates.info.ethFiatRate} €</StyledCol>
</StyledRow>
</MyListGroup>
</StyledCol>
</StyledRow>
</StyledMyListGroup>
</Segment>
<Segment
loading={metrics.isLoading || monetarySupervisor.isLoading || augmintToken.isLoading}
style={{ color: "black" }}
Expand Down
8 changes: 8 additions & 0 deletions src/containers/augmintToken/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,11 @@ export const StyledRow = styled(Row)`
font-size: ${remCalc(18)};
}
`;

export const StyledDiv = styled.div`
padding-top: 25px;
padding-left: 45px;
${media.tablet`
padding-left: 20px;
`};
`;
7 changes: 5 additions & 2 deletions src/modules/reducers/rates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ export const refreshRates = () => {
const web3 = store.getState().web3Connect.web3Instance;
const augmintTokenInstance = store.getState().contracts.latest.augmintToken.web3ContractInstance;
const bytes32_peggedSymbol = await augmintTokenInstance.methods.peggedSymbol().call();
const augmintRates = store.getState().web3Connect.augmint.rates;

const ratesInstance = store.getState().contracts.latest.rates.web3ContractInstance;

const [bn_ethFiatRate, bn_tokenBalance, bn_weiBalance] = await Promise.all([
const [rates, bn_ethFiatRate, bn_tokenBalance, bn_weiBalance] = await Promise.all([
augmintRates.getAugmintRate("EUR"),
ratesInstance.methods.convertFromWei(bytes32_peggedSymbol, ONE_ETH_IN_WEI.toString()).call(),
augmintTokenInstance.methods.balanceOf(ratesInstance._address).call(),
web3.eth.getBalance(ratesInstance._address)
Expand All @@ -81,7 +83,8 @@ export const refreshRates = () => {
tokenBalance: bn_tokenBalance / DECIMALS_DIV,
bn_ethFiatRate: new BigNumber(bn_ethFiatRate / DECIMALS_DIV),
ethFiatRate: bn_ethFiatRate / DECIMALS_DIV,
fiatEthRate: (1 / bn_ethFiatRate) * DECIMALS_DIV
fiatEthRate: (1 / bn_ethFiatRate) * DECIMALS_DIV,
lastUpdated: rates.lastUpdated
}
});
} catch (error) {
Expand Down