diff --git a/app/components/account-card/template.hbs b/app/components/account-card/template.hbs
index d96dedb6..b3318f22 100644
--- a/app/components/account-card/template.hbs
+++ b/app/components/account-card/template.hbs
@@ -3,7 +3,7 @@
{{#liquid-if hideHistory class="hide-qr"}}
{{qr-code content=model.id}}
{{/liquid-if}}
-
- {{fa-icon "paper-plane" ariaHidden=true}} {{model.type}}
+ {{#if (eq model.type 'send')}}
+ {{fa-icon "paper-plane" ariaHidden=true}}
+ {{else}}
+ {{fa-icon "envelope-open" ariaHidden=true}}
+ {{/if}}
diff --git a/app/components/account-history/template.hbs b/app/components/account-history/template.hbs
index 6533ff3d..c2a0ee2f 100644
--- a/app/components/account-history/template.hbs
+++ b/app/components/account-history/template.hbs
@@ -4,6 +4,6 @@
{{/each}}
{{else}}
-
No History found
+ {{t 'wallets.accounts.history.none'}}
{{/if}}
\ No newline at end of file
diff --git a/app/components/ballance-overview/component.js b/app/components/balance-overview/component.js
similarity index 100%
rename from app/components/ballance-overview/component.js
rename to app/components/balance-overview/component.js
diff --git a/app/components/ballance-overview/template.hbs b/app/components/balance-overview/template.hbs
similarity index 84%
rename from app/components/ballance-overview/template.hbs
rename to app/components/balance-overview/template.hbs
index 5ba8316e..3969bda1 100644
--- a/app/components/ballance-overview/template.hbs
+++ b/app/components/balance-overview/template.hbs
@@ -18,12 +18,12 @@
-
{{t 'wallets.overview.balance' htmlSafe=true balance=(format-amount total)}}
+
{{t 'wallets.overview.balance' htmlSafe=true balance=(format-amount total)}}
- BALLANCE PENDING
+ BALANCE PENDING
- 100.00
+ {{format-amount 100}}
diff --git a/app/components/navigation-bar/template.hbs b/app/components/navigation-bar/template.hbs
index 32e225c4..28d8677f 100644
--- a/app/components/navigation-bar/template.hbs
+++ b/app/components/navigation-bar/template.hbs
@@ -1,9 +1,9 @@
{{#link-to 'index' class="navbar-brand"}}
-
-
-
-
+
+
+
+
{{/link-to}}
diff --git a/app/components/wallet-overview/component.js b/app/components/wallet-overview/component.js
index 57592b8a..c076d2c2 100644
--- a/app/components/wallet-overview/component.js
+++ b/app/components/wallet-overview/component.js
@@ -15,6 +15,27 @@ export default Component.extend(PagedMixin, {
totals: null,
contentKey: 'accounts',
+ // didRender() {
+ // this._super(...arguments);
+ // // this.$('.slick-slider').slick('unslick');
+ // this.$('.slick-list').remove();
+ // this.$('.slick-slider').slick('unslick').slick(this.get('settings'));
+ // },
+
+ @computed()
+ get settings() {
+ return {
+ dots: true,
+ slidesToShow: (this.get('accounts.length') <= 3) ? this.get('accounts.length') : 4,
+ slidesToScroll: 1,
+ infinite: false,
+ arrows: true,
+ edgeFriction: true,
+ centerPadding: '10px',
+ responsive: this.get('breakpoints'),
+ };
+ },
+
@computed()
get breakpoints() {
return [
diff --git a/app/components/wallet-overview/template.hbs b/app/components/wallet-overview/template.hbs
index 7ace9573..7e0c2d32 100644
--- a/app/components/wallet-overview/template.hbs
+++ b/app/components/wallet-overview/template.hbs
@@ -6,8 +6,8 @@
dots=true
slidesToShow=(if (lte accounts.length 3) accounts.length 4)
slidesToScroll=1
+ infinite=false
arrows=true
- centerMode=true
edgeFriction=true
centerPadding='10px'
responsive=breakpoints}}
diff --git a/app/styles/account-card.scss b/app/styles/account-card.scss
index c6362c2a..ba127d0f 100644
--- a/app/styles/account-card.scss
+++ b/app/styles/account-card.scss
@@ -4,62 +4,70 @@
height: 400px;
justify-content: center;
- .account-card {
- align-items: center;
- background-color: #fff;
- border-radius: 10px;
- display: flex;
- flex-direction: column;
- height: 350px;
- margin: 0 auto;
- padding: 30px 20px;
- transition: 1s;
- width: 280px;
-
- sup > img {
- display: inline-block;
+ a {
+ &:focus,
+ &:active {
+ outline: none;
}
-
- .qr-code {
- height: 157px;
- margin-bottom: 20px;
- width: 157px;
- }
-
- .ballance {
- color: $dark-purple;
- font-size: 20px;
- line-height: 1;
- text-align: center;
- }
-
- .ballance span {
- font-size: 13px;
- }
-
- .ballance sub {
- color: $green;
- font-size: 14px;
- }
-
- .account-id {
- background-color: $dark-purple;
- color: $white;
- display: block;
- font-size: 12px;
- height: 60px;
- margin: 0;
- padding: 10px;
- overflow-wrap: break-word;
- width: 100%;
- }
-
- .account-id span:first-child {
- color: $light-blue;
- }
-
- .account-id span:last-child {
- color: $orange;
+
+ .account-card {
+ align-items: center;
+ background-color: #fff;
+ border-radius: 10px;
+ display: flex;
+ flex-direction: column;
+ height: 350px;
+ margin: 0 auto;
+ padding: 30px 20px;
+ transition: 1s;
+ width: 280px;
+
+ sup > img {
+ display: inline-block;
+ }
+
+ .qr-code {
+ height: 157px;
+ margin-bottom: 20px;
+ width: 157px;
+ }
+
+ .balance {
+ color: $dark-purple;
+ font-size: 20px;
+ height: 50px;
+ line-height: 1;
+ text-align: center;
+ }
+
+ .balance span {
+ font-size: 13px;
+ }
+
+ .balance sub {
+ color: $green;
+ font-size: 14px;
+ }
+
+ .account-id {
+ background-color: $dark-purple;
+ color: $white;
+ display: block;
+ font-size: 12px;
+ height: 60px;
+ margin: 0;
+ padding: 10px;
+ overflow-wrap: break-word;
+ width: 100%;
+ }
+
+ .account-id span:first-child {
+ color: $light-blue;
+ }
+
+ .account-id span:last-child {
+ color: $orange;
+ }
}
}
@@ -87,6 +95,7 @@
.slick-next {
height: 50px;
width: 50px;
+ z-index: 9;
}
.slick-prev:before,
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 98653f56..2c57f55e 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -8,7 +8,7 @@
@import "utilities";
-@import "ballance-overview";
+@import "balance-overview";
@import "navigation-bar";
diff --git a/app/styles/ballance-overview.scss b/app/styles/balance-overview.scss
similarity index 83%
rename from app/styles/ballance-overview.scss
rename to app/styles/balance-overview.scss
index 2978ed47..5b3d7703 100644
--- a/app/styles/ballance-overview.scss
+++ b/app/styles/balance-overview.scss
@@ -14,10 +14,11 @@
text-decoration: underline;
}
-.lead {
+.balance {
border: 0;
color: $white;
font-size: 90px;
+ font-weight: 300;
line-height: 1;
margin: 0;
padding: 0;
@@ -28,8 +29,9 @@
color: $white;
font-size: 16px;
letter-spacing: 2px;
- margin: 20px 0 0;
- text-align: center;
+ line-height: 2;
+ margin: 10px 0 0;
+ text-align: center;
text-transform: uppercase;
}
@@ -37,5 +39,6 @@
color: $green;
font-size: 30px;
letter-spacing: 1.33px;
+ line-height: 1.3;
margin: 0;
}
\ No newline at end of file
diff --git a/app/wallets/overview/accounts/history/template.hbs b/app/wallets/overview/accounts/history/template.hbs
index 580b8e74..89be923f 100644
--- a/app/wallets/overview/accounts/history/template.hbs
+++ b/app/wallets/overview/accounts/history/template.hbs
@@ -6,7 +6,7 @@
{{fa-icon "chevron-down"}}
- {{else}}
+ {{else}}
{{fa-icon "chevron-up"}}
diff --git a/app/wallets/overview/template.hbs b/app/wallets/overview/template.hbs
index b97f8e49..6c63857a 100644
--- a/app/wallets/overview/template.hbs
+++ b/app/wallets/overview/template.hbs
@@ -1,5 +1,5 @@
{{#liquid-if hideHistory class="balance"}}
- {{ballance-overview}}
+ {{balance-overview}}
{{/liquid-if}}
{{#liquid-if hideHistory class="balance"}}
@@ -7,6 +7,7 @@
diff --git a/tests/integration/components/ballance-overview/component-test.js b/tests/integration/components/balance-overview/component-test.js
similarity index 70%
rename from tests/integration/components/ballance-overview/component-test.js
rename to tests/integration/components/balance-overview/component-test.js
index 0e981747..0f585c3a 100644
--- a/tests/integration/components/ballance-overview/component-test.js
+++ b/tests/integration/components/balance-overview/component-test.js
@@ -3,8 +3,8 @@ import { describe, it } from 'mocha';
import { setupComponentTest } from 'ember-mocha';
import hbs from 'htmlbars-inline-precompile';
-describe('Integration | Component | ballance-overview', () => {
- setupComponentTest('ballance-overview', {
+describe('Integration | Component | balance-overview', () => {
+ setupComponentTest('balance-overview', {
integration: true,
});
@@ -13,12 +13,12 @@ describe('Integration | Component | ballance-overview', () => {
// Handle any actions with this.on('myAction', function(val) { ... });
// Template block usage:
// this.render(hbs`
- // {{#ballance-overview}}
+ // {{#balance-overview}}
// template content
- // {{/ballance-overview}}
+ // {{/balance-overview}}
// `);
- this.render(hbs`{{ballance-overview}}`);
+ this.render(hbs`{{balance-overview}}`);
expect(this.$()).to.have.length(1);
});
});