diff --git a/app/components/account-carousel/component.js b/app/components/account-carousel/component.js index c1b3e708..463dccde 100644 --- a/app/components/account-carousel/component.js +++ b/app/components/account-carousel/component.js @@ -43,10 +43,12 @@ export default Component.extend({ initialSlide, adaptiveHeight: true, centerPadding: '10px', + slidesToShow: 4, + slidesToScroll: 4, dots: true, infinite: false, - mobileFirst: true, speed: 250, + arrows: true, }); } @@ -81,28 +83,33 @@ export default Component.extend({ get breakpoints() { return [ { - breakpoint: 1200, + breakpoint: 1500, settings: { - slidesToShow: 4, + slidesToShow: 3, + slidesToScroll: 3, }, }, { - breakpoint: 992, + breakpoint: 1200, settings: { - slidesToShow: 3, + slidesToShow: 2, + slidesToScroll: 2, }, }, { - breakpoint: 768, + breakpoint: 780, settings: { - slidesToShow: 2, + slidesToShow: 1, + slidesToScroll: 1, }, }, { - breakpoint: 576, + breakpoint: 430, settings: { slidesToShow: 1, + slidesToScroll: 1, arrows: false, + draggable: true, }, }, ]; diff --git a/app/components/account-history-entry/component.js b/app/components/account-history-entry/component.js index bb93d73f..1aca446a 100644 --- a/app/components/account-history-entry/component.js +++ b/app/components/account-history-entry/component.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; export default Component.extend({ + classNames: ['row', 'justify-content-center'], }); diff --git a/app/components/account-history-entry/template.hbs b/app/components/account-history-entry/template.hbs index 46637994..251a172d 100644 --- a/app/components/account-history-entry/template.hbs +++ b/app/components/account-history-entry/template.hbs @@ -1,15 +1,15 @@ -
+
{{#if (eq model.type 'send')}} - {{fa-icon "paper-plane" ariaHidden=true}} + {{fa-icon "paper-plane" ariaHidden=true class="send"}} {{else}} - {{fa-icon "envelope-open" ariaHidden=true}} + {{fa-icon "envelope-open" ariaHidden=true class="receive"}} {{/if}}

- {{format-ammount model.amount}} + {{format-amount model.amount precision=2}}

-

+

{{model.account}} {{!-- xrb_17oqj4rpads4o6ud448yymzk9jot8yzmzyeuteq3bj38cwjpt4rrgxhfx fr1 --}} diff --git a/app/components/account-history/template.hbs b/app/components/account-history/template.hbs index 69e6eff5..685bb95b 100644 --- a/app/components/account-history/template.hbs +++ b/app/components/account-history/template.hbs @@ -1,9 +1,11 @@ -{{#if model}} - {{#each model as |item|}} +{{#if history}} + {{#each history as |item|}} {{account-history-entry model=item}} {{/each}} {{else}} -

-

{{t 'wallets.accounts.history.none'}}

+
+
+

{{t 'wallets.accounts.history.none'}}

+
{{/if}} \ No newline at end of file diff --git a/app/styles/history.scss b/app/styles/history.scss index 82fde8e5..1dbd8cd2 100644 --- a/app/styles/history.scss +++ b/app/styles/history.scss @@ -5,9 +5,6 @@ overflow: scroll; > div { - align-items: center; - display: flex; - justify-content: center; width: 100%; } } @@ -22,11 +19,11 @@ margin: 0; } - &.send i { + .send { color: #538DCA; } - &.receive i { + .receive { color: #EDA63F; } diff --git a/app/wallets/overview/accounts/history/template.hbs b/app/wallets/overview/accounts/history/template.hbs index 89be923f..38113469 100644 --- a/app/wallets/overview/accounts/history/template.hbs +++ b/app/wallets/overview/accounts/history/template.hbs @@ -18,8 +18,8 @@ {{#liquid-if (not hideHistory) class="hide-history"}}
-
- {{account-history model=history}} +
+ {{account-history history=model.history}}