From 29af99e0d8003b4fbf1875fd4729cec47c6e31a8 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Thu, 4 Jul 2019 15:58:15 +0200 Subject: [PATCH 01/11] feat(augmintToken): add etheur rate to the top of stability board --- src/containers/augmintToken/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index fafcff7a..5f3689c5 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -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 { ETHEUR } from "utils/constants"; import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol } from "./styles"; import theme from "styles/theme"; @@ -217,6 +218,12 @@ class AugmintToken extends React.Component { {(metrics.error || monetarySupervisor.loadError || augmintToken.error) && ( {aurSupplyError.message} )} +
+ {ETHEUR}: + + {rates.info.ethFiatRate} + +
A-EUR Supply From b5da0a8bb0c47001030f2ce0eb06af4e4fff5325 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Thu, 4 Jul 2019 16:19:56 +0200 Subject: [PATCH 02/11] fix(augmintToken): add padding --- src/containers/augmintToken/index.js | 6 +++--- src/containers/augmintToken/styles.js | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 5f3689c5..982f6211 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -19,7 +19,7 @@ import Button from "components/augmint-ui/button"; import { AEUR, ETH, Percent } from "components/augmint-ui/currencies"; import { ETHEUR } from "utils/constants"; -import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol } from "./styles"; +import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol, StyledDiv } from "./styles"; import theme from "styles/theme"; import { theme as mediaTheme } from "styles/media"; import { ThemeProvider } from "styled-components"; @@ -218,12 +218,12 @@ class AugmintToken extends React.Component { {(metrics.error || monetarySupervisor.loadError || augmintToken.error) && ( {aurSupplyError.message} )} -
+ {ETHEUR}: {rates.info.ethFiatRate} -
+ A-EUR Supply diff --git a/src/containers/augmintToken/styles.js b/src/containers/augmintToken/styles.js index fa33b56b..1a9fec7e 100644 --- a/src/containers/augmintToken/styles.js +++ b/src/containers/augmintToken/styles.js @@ -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; + `}; +`; From 9cc0c3270116031da19291fda4881ca4974185ae Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 14:48:32 +0200 Subject: [PATCH 03/11] feat(rates): add lastUpdated to store & show on /stability --- src/containers/augmintToken/index.js | 6 ++++++ src/modules/reducers/rates.js | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 982f6211..3924e788 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -52,6 +52,8 @@ class AugmintToken extends React.Component { const ethReservesError = monetarySupervisor.loadError || metrics.error; const stabilityRatiosError = rates.loadError || metrics.error || monetarySupervisor.loadError; + const ratesLastUpdated = new Date(rates.info.lastUpdated); + if (Object.keys(metrics.loansData).length) { bn_loansCollected = metrics.loansData.bn_collectedLoansAmount.plus( metrics.loansData.bn_defaultedLoansAmount @@ -223,6 +225,10 @@ class AugmintToken extends React.Component { {rates.info.ethFiatRate} + +
+ {ratesLastUpdated.toLocaleString()} + A-EUR Supply diff --git a/src/modules/reducers/rates.js b/src/modules/reducers/rates.js index 2b76c4f7..fdaf3ff6 100644 --- a/src/modules/reducers/rates.js +++ b/src/modules/reducers/rates.js @@ -63,15 +63,19 @@ 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) ]); + console.log(rates); + return dispatch({ type: RATES_REFRESHED, result: { @@ -81,7 +85,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) { From 67003a160da8454caee02183340d9cbbed8d89e8 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 15:02:05 +0200 Subject: [PATCH 04/11] feat(augmintToken): add last updated text --- src/containers/augmintToken/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 3924e788..c5e40c6f 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -227,7 +227,7 @@ class AugmintToken extends React.Component {
- {ratesLastUpdated.toLocaleString()} + Last updated: {ratesLastUpdated.toLocaleString()} A-EUR Supply From c9a64c2b2095dac91034a896611e744b773c8ce7 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 15:43:37 +0200 Subject: [PATCH 05/11] feat(augmintToken): make styling consistent --- src/containers/augmintToken/index.js | 29 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index c5e40c6f..2844c943 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -18,6 +18,7 @@ import Segment from "components/augmint-ui/segment"; import Button from "components/augmint-ui/button"; import { AEUR, ETH, Percent } from "components/augmint-ui/currencies"; import { ETHEUR } from "utils/constants"; +import moment from "moment"; import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol, StyledDiv } from "./styles"; import theme from "styles/theme"; @@ -213,6 +214,24 @@ class AugmintToken extends React.Component { + + Rates feed + + + + + + + {ETHEUR}:
+ Last updated: {ratesLastUpdated.toLocaleString()} + + {rates.info.ethFiatRate} + + + + + + {aurSupplyError.message} )} - - {ETHEUR}: - - {rates.info.ethFiatRate} - - -
- Last updated: {ratesLastUpdated.toLocaleString()} - - A-EUR Supply From cbc273355ff56266e0967ab21dcfceaa6fdec887 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:13:48 +0200 Subject: [PATCH 06/11] feat(augmintToken): change time format to relative --- src/containers/augmintToken/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 2844c943..cd0c950c 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -53,7 +53,10 @@ class AugmintToken extends React.Component { const ethReservesError = monetarySupervisor.loadError || metrics.error; const stabilityRatiosError = rates.loadError || metrics.error || monetarySupervisor.loadError; - const ratesLastUpdated = new Date(rates.info.lastUpdated); + const ratesSinceLastUpdated = 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( @@ -223,7 +226,7 @@ class AugmintToken extends React.Component { {ETHEUR}:
- Last updated: {ratesLastUpdated.toLocaleString()} + Last updated: {ratesSinceLastUpdated} {rates.info.ethFiatRate} From b80f0ab4554292afda74f78f39d116207ab41fab Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:15:32 +0200 Subject: [PATCH 07/11] fix(augmintToken): add logic to show time only when available --- src/containers/augmintToken/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index cd0c950c..ee40171a 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -53,10 +53,9 @@ class AugmintToken extends React.Component { const ethReservesError = monetarySupervisor.loadError || metrics.error; const stabilityRatiosError = rates.loadError || metrics.error || monetarySupervisor.loadError; - const ratesSinceLastUpdated = moment( - new Date(rates.info.lastUpdated).toLocaleString(), - "DDMMYYYY, hh:mm:ss" - ).fromNow(); + 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( From 219d9436eef721ce254914cd8dae258bcb338bb5 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:20:01 +0200 Subject: [PATCH 08/11] style(augmintToken): remove unused comps --- src/containers/augmintToken/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index ee40171a..7e46811f 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -20,7 +20,7 @@ import { AEUR, ETH, Percent } from "components/augmint-ui/currencies"; import { ETHEUR } from "utils/constants"; import moment from "moment"; -import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol, StyledDiv } from "./styles"; +import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol } from "./styles"; import theme from "styles/theme"; import { theme as mediaTheme } from "styles/media"; import { ThemeProvider } from "styled-components"; From 1a4d3fc11be04066df05c74fafee4ac0c5d44043 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:28:38 +0200 Subject: [PATCH 09/11] fix(augmintToken): add minor style changes --- src/containers/augmintToken/index.js | 10 ++++++---- src/modules/reducers/rates.js | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 7e46811f..88d4f969 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -17,7 +17,6 @@ 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 { ETHEUR } from "utils/constants"; import moment from "moment"; import { StyledContainer, StyledHeader, StyledMyListGroup, StyledRow, StyledCol } from "./styles"; @@ -224,10 +223,13 @@ class AugmintToken extends React.Component { - {ETHEUR}:
- Last updated: {ratesSinceLastUpdated} + 1 ETH: +
+ + Last updated: {ratesSinceLastUpdated} + - {rates.info.ethFiatRate} + {rates.info.ethFiatRate}€ diff --git a/src/modules/reducers/rates.js b/src/modules/reducers/rates.js index fdaf3ff6..8eed4607 100644 --- a/src/modules/reducers/rates.js +++ b/src/modules/reducers/rates.js @@ -74,8 +74,6 @@ export const refreshRates = () => { web3.eth.getBalance(ratesInstance._address) ]); - console.log(rates); - return dispatch({ type: RATES_REFRESHED, result: { From 55b73b6300bc5dcb59207a3b057738c172f55b21 Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:38:56 +0200 Subject: [PATCH 10/11] fix(augmintToken): add minor style changes --- src/containers/augmintToken/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 88d4f969..94bdf97c 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -223,7 +223,7 @@ class AugmintToken extends React.Component { - 1 ETH: + 1 ETH
Last updated: {ratesSinceLastUpdated} From 31855b6c08de856ddb08dfc67adefa0dd03c11aa Mon Sep 17 00:00:00 2001 From: Adam Ridovics Date: Fri, 5 Jul 2019 16:47:24 +0200 Subject: [PATCH 11/11] fix(augmintToken): add minor style changes --- src/containers/augmintToken/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/augmintToken/index.js b/src/containers/augmintToken/index.js index 94bdf97c..46e51613 100644 --- a/src/containers/augmintToken/index.js +++ b/src/containers/augmintToken/index.js @@ -229,7 +229,7 @@ class AugmintToken extends React.Component { Last updated: {ratesSinceLastUpdated} - {rates.info.ethFiatRate}€ + {rates.info.ethFiatRate} €