diff --git a/src/javascript/app/base/clock.js b/src/javascript/app/base/clock.js index 8ee1dd0aa16dd..aa7b5924468c0 100644 --- a/src/javascript/app/base/clock.js +++ b/src/javascript/app/base/clock.js @@ -28,11 +28,10 @@ const Clock = (() => { } }; - const showLocalTimeOnHover = (selector, is_table) => { + const showLocalTimeOnHover = (selector) => { document.querySelectorAll(selector || '.date').forEach((el) => { const gmt_time_str = el.textContent.replace('\n', ' '); - - const local_time = !is_table ? moment.utc(gmt_time_str, 'YYYY-MM-DD HH:mm:ss').local() : moment.utc(gmt_time_str, 'DD MMM YYYY HH:mm:ss').local() ; + const local_time = moment.utc(gmt_time_str, 'YYYY-MM-DD HH:mm:ss').local(); if (local_time.isValid()) { el.setAttribute('data-balloon', local_time.format('YYYY-MM-DD HH:mm:ss Z')); } diff --git a/src/javascript/app/pages/user/account/portfolio/portfolio.init.js b/src/javascript/app/pages/user/account/portfolio/portfolio.init.js index bc05d45547f74..034bf68c80918 100644 --- a/src/javascript/app/pages/user/account/portfolio/portfolio.init.js +++ b/src/javascript/app/pages/user/account/portfolio/portfolio.init.js @@ -48,15 +48,13 @@ const PortfolioInit = (() => { }; const createPortfolioRow = (data, is_first) => { - const exclude_currency = true; const new_class = is_first ? '' : 'new'; const $div = $('
'); $div.append($('', { class: `tr-first ${new_class} ${data.contract_id}`, id: data.contract_id }) - .append($('', { class: 'contract', text: data.longcode })) .append($('', { class: 'ref' }).append($(`${data.transaction_id}`))) - .append($('', { class: 'currency', text: data.currency })) - .append($('', { class: 'purchase' }).append($('', { html: formatMoney(data.currency, data.buy_price, exclude_currency) }))) - .append($('', { class: 'payout' }).append($('', { html: +data.payout ? formatMoney(data.currency, data.payout, exclude_currency) : '-' }))) + .append($('', { class: 'payout' }).append($('', { html: +data.payout ? formatMoney(data.currency, data.payout) : '-' }))) + .append($('', { class: 'details', text: data.longcode })) + .append($('', { class: 'purchase' }).append($('', { html: formatMoney(data.currency, data.buy_price) }))) .append($('', { class: 'indicative' }).append($('', { class: 'indicative_price', text: '--.--' }))) .append($('', { class: 'button' }).append($('