diff --git a/src/gui/src/UI/Settings/UITabUsage.js b/src/gui/src/UI/Settings/UITabUsage.js index 60aba80ee..9eaa9bd07 100644 --- a/src/gui/src/UI/Settings/UITabUsage.js +++ b/src/gui/src/UI/Settings/UITabUsage.js @@ -116,10 +116,22 @@ async function update_usage_details($el_window){ if(typeof res.usage[key] !== 'object') continue; + // get the units + let units = res.usage[key].units; + + // Bytes should be formatted as human readable + if(key.startsWith('filesystem:') && key.endsWith(':bytes')){ + units = window.byte_format(units); + } + // Everything else should be formatted as a number + else{ + units = window.number_format(units, {decimals: 0, thousandSeparator: ','}); + } + h += ` ${key} - ${window.number_format(res.usage[key].units, {decimals: 0, thousandSeparator: ','})} + ${units} ${window.number_format(res.usage[key].cost / 100_000_000, { decimals: 2, prefix: '$' })} `; } diff --git a/src/gui/src/UI/UITaskbarItem.js b/src/gui/src/UI/UITaskbarItem.js index 4377e64e1..ff6da1bc0 100644 --- a/src/gui/src/UI/UITaskbarItem.js +++ b/src/gui/src/UI/UITaskbarItem.js @@ -112,18 +112,6 @@ function UITaskbarItem(options){ if($(el_taskbar_item).hasClass('has-open-contextmenu')) return; - el_taskbar_item.querySelector("img").animate( - [ - { transform: 'translateY(0) scale(1)' }, - { transform: 'translateY(-5px) scale(1.2)' }, - { transform: 'translateY(0) scale(1)' } - ], - { - duration: 300, - easing: 'ease-out', - } - ); - if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){ // re-show each window in this app group $(`.window[data-app="${options.app}"]`).showWindow();