Skip to content

DEXW-1785: fix thing with replace to fake values #1367

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
GIvanovWaves merged 6 commits into from
Jun 11, 2019
Merged

DEXW-1785: fix thing with replace to fake values #1367

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c85e870
DEXW-1785: fix thing with replace to fake values
Jun 10, 2019
ccca222
DEXW-1785: added check for volume
Jun 10, 2019
49adf03
DEXW-1785: added for ticker check
Jun 10, 2019
68d2647
DEXW-1785: change fakeValues method
Jun 10, 2019
23b80c8
DEXW-1785: refactor promises
Jun 10, 2019
ba3d2f7
DEXW-1785: more refactor
Jun 11, 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
62 changes: 31 additions & 31 deletions src/modules/welcome/controllers/WelcomeCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,24 @@
* @private
*/
_initPairs() {
const FAKE_RATE_HISTORY = [{
rate: new BigNumber(0),
timestamp: ds.utils.normalizeTime(Date.now())
}];

const startDate = angularUtils.moment().add().day(-7);
Promise.all(PAIRS_IN_SLIDER.map(pair => ds.api.pairs.get(pair.amount, pair.price)))
.then(pairs => Promise.all(pairs.map(pair => ds.api.pairs.info(pair))))
.then(infoList => {
const tempInfoList = flatten(infoList);
Promise.all(tempInfoList.map(info => {
return waves.utils.getRateHistory(info.amountAsset.id, info.priceAsset.id, startDate);
})).then(rateHistory => {
this.pairsInfoList = tempInfoList.map((info, i) => {
return {
volumeBigNum: info.volume.getTokens(),
rateHistory: rateHistory[i],
...info
};
});
})
.catch(() => {
this.pairsInfoList = tempInfoList.map(this._fakeValues);
const flattenInfoList = flatten(infoList);

Promise.all(
PAIRS_IN_SLIDER
.map(({ amount, price }) => waves.utils.getRateHistory(amount, price, startDate))
.map(promise => promise.catch(() => FAKE_RATE_HISTORY))
)
.then(rateHistory => {
this.pairsInfoList = rateHistory.map(WelcomeCtrl._fillValues(flattenInfoList));
})
.then(() => {
angularUtils.safeApply($scope);
Expand All @@ -179,24 +179,24 @@
}

/**
* @param info
* @private
* @param {array} infoList
* @static
*/
_fakeValues(info) {
return {
rateHistory: [{
rate: new BigNumber(0),
timestamp: ds.utils.normalizeTime(Date.now())
}],
ticker: info.displayName,
amountAsset: info.amountAsset,
priceAsset: info.priceAsset,
change24: new BigNumber(0),
high: new Money(0, info.priceAsset),
id: info.id,
lastPrice: new Money(0, info.priceAsset),
low: new Money(0, info.priceAsset),
volume: new Money(0, info.priceAsset)
static _fillValues(infoList) {
return (rateHistory, i) => {
const info = infoList[i];
const volume = info.volume || new Money(0, info.priceAsset);
return {
...info,
ticker: info.ticker || info.displayName,
change24: info.change24 || new BigNumber(0),
high: info.high || new Money(0, info.priceAsset),
lastPrice: info.lastPrice || new Money(0, info.priceAsset),
low: info.low || new Money(0, info.priceAsset),
volume,
rateHistory,
volumeBigNum: volume.getTokens()
};
};
}

Expand Down