From bfc533bbf78279f7ce6748a0e262f8789521dc1f Mon Sep 17 00:00:00 2001 From: Gabriel Masclef Date: Fri, 5 Jan 2018 17:34:49 -0300 Subject: [PATCH] Fix: Time line in tx-details, styles and close buttons for modals --- .../incoming-data-menu.html | 12 ++++---- .../amazon-card-details.html | 29 ++++++++++--------- .../coinbase-tx-details.html | 5 ++-- .../glidera/modal/glidera-tx-details.html | 6 ++-- .../mercado-libre-card-details.html | 8 ++--- src/pages/paypro/paypro.html | 2 +- .../settings/alt-currency/alt-currency.html | 10 +++---- src/pages/tx-details/tx-details.html | 10 +++---- src/pages/tx-details/tx-details.scss | 25 +++++++--------- src/pages/tx-details/tx-details.ts | 4 +-- src/pages/txp-details/txp-details.html | 12 ++++---- src/pages/txp-details/txp-details.scss | 16 ++-------- 12 files changed, 64 insertions(+), 75 deletions(-) diff --git a/src/pages/incoming-data-menu/incoming-data-menu.html b/src/pages/incoming-data-menu/incoming-data-menu.html index 7e590a82c..6c3c8c9ef 100644 --- a/src/pages/incoming-data-menu/incoming-data-menu.html +++ b/src/pages/incoming-data-menu/incoming-data-menu.html @@ -1,8 +1,8 @@ - @@ -30,19 +30,19 @@
{{data}}
@@ -68,7 +68,7 @@
{{data}}
diff --git a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.html b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.html index e712a0c0d..19ae45c22 100644 --- a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.html +++ b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.html @@ -3,8 +3,8 @@ Details - @@ -27,7 +27,8 @@
- Claim code: {{card.claimCode}} + Claim code: + {{card.claimCode}}
- * Amazon.com is not a sponsor of this promotion. Except as required - by law, Amazon.com Gift Cards ("GCs") cannot be transferred for - value or redeemed for cash. GCs may be used only for purchases of eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. GCs are issued by ACI Gift - Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP of Amazon.com, - Inc. or its affiliates. No expiration date or service fees. + * + Amazon.com is not a sponsor of this promotion. Except as required by law, + Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases + of eligible goods at + Amazon.com or certain of its affiliated websites. For complete terms and conditions, see + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ + & © are IP of + Amazon.com, Inc. or its affiliates. No expiration date or service fees.
- + \ No newline at end of file diff --git a/src/pages/integrations/coinbase/coinbase-tx-details/coinbase-tx-details.html b/src/pages/integrations/coinbase/coinbase-tx-details/coinbase-tx-details.html index 587061245..71001af70 100644 --- a/src/pages/integrations/coinbase/coinbase-tx-details/coinbase-tx-details.html +++ b/src/pages/integrations/coinbase/coinbase-tx-details/coinbase-tx-details.html @@ -5,7 +5,7 @@ @@ -37,8 +37,7 @@ -{{tx.amount.amount.replace('-','')}} {{tx.amount.currency}}
- -{{tx.native_amount.amount.replace('-','')}} - {{tx.native_amount.currency}} + -{{tx.native_amount.amount.replace('-','')}} {{tx.native_amount.currency}}
diff --git a/src/pages/integrations/glidera/modal/glidera-tx-details.html b/src/pages/integrations/glidera/modal/glidera-tx-details.html index b7d33abf6..aecd276e6 100644 --- a/src/pages/integrations/glidera/modal/glidera-tx-details.html +++ b/src/pages/integrations/glidera/modal/glidera-tx-details.html @@ -4,9 +4,9 @@ Details - + diff --git a/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html b/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html index e145b1b22..97d753ee2 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html +++ b/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.html @@ -4,7 +4,7 @@ Details @@ -69,10 +69,10 @@ + {{'Help & Support' | translate }} + - + \ No newline at end of file diff --git a/src/pages/paypro/paypro.html b/src/pages/paypro/paypro.html index 65d18f5b3..131fe45de 100644 --- a/src/pages/paypro/paypro.html +++ b/src/pages/paypro/paypro.html @@ -3,7 +3,7 @@ diff --git a/src/pages/settings/alt-currency/alt-currency.html b/src/pages/settings/alt-currency/alt-currency.html index ae5e19e99..291ff20e4 100644 --- a/src/pages/settings/alt-currency/alt-currency.html +++ b/src/pages/settings/alt-currency/alt-currency.html @@ -1,8 +1,6 @@ - - - Alternative currency + {{'Alternative currency' | translate}} @@ -12,13 +10,15 @@ - {{ lastUsedAltCurrency.name }} {{lastUsedAltCurrency.isoCode}} + {{ lastUsedAltCurrency.name }} + {{lastUsedAltCurrency.isoCode}} - {{ alt.name }} {{alt.isoCode}} + {{ alt.name }} + {{alt.isoCode}} diff --git a/src/pages/tx-details/tx-details.html b/src/pages/tx-details/tx-details.html index 704adf791..2fe60128d 100644 --- a/src/pages/tx-details/tx-details.html +++ b/src/pages/tx-details/tx-details.html @@ -94,19 +94,19 @@ - +
This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender - +
- +
This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself. Learn more - +
{{'Confirmations' | translate}} @@ -136,7 +136,7 @@
!
-
{{actionList.length - i}}
+
{{actionList.length - i}}
{{a.description}}
diff --git a/src/pages/tx-details/tx-details.scss b/src/pages/tx-details/tx-details.scss index ce20ab7a5..118be8419 100644 --- a/src/pages/tx-details/tx-details.scss +++ b/src/pages/tx-details/tx-details.scss @@ -40,6 +40,15 @@ page-tx-details { } } + .low-fees { + font-size: 14px; + color: #777; + padding: 1rem 2rem 1rem 2rem; + img { + margin-right: 0.1rem; + } + } + .timeline-item { border: 0; &:nth-child(2) { @@ -68,10 +77,10 @@ page-tx-details { margin-right: .5rem; position: relative; - &::before { + .line::before { content: ''; background: #e8e8e8; - height: 100px; + height: 42px; width: 1px; position: absolute; left: 50%; @@ -80,18 +89,6 @@ page-tx-details { top: 0; } - &::after { - content: ''; - background: #e8e8e8; - height: 100px; - width: 1px; - position: absolute; - left: 50%; - -webkit-transform: translateX(-50%) translateY(100%); - transform: translateX(-50%) translateY(100%); - bottom: 0; - } - > div { border: 3px solid $v-success-color; border-radius: $v-icon-border-radius; diff --git a/src/pages/tx-details/tx-details.ts b/src/pages/tx-details/tx-details.ts index 32efea80f..722261c1c 100644 --- a/src/pages/tx-details/tx-details.ts +++ b/src/pages/tx-details/tx-details.ts @@ -109,9 +109,9 @@ export class TxDetailsPage { private initActionList(): void { this.actionList = []; - if (this.btx.action != 'sent' || !this.isShared) return; + if (this.btx.action != 'sent' && this.btx.action != 'moved' || !this.isShared) return; - var actionDescriptions = { + let actionDescriptions = { created: 'Proposal Created', // Todo: gettextCatalog accept: 'Accepted', // Todo: gettextCatalog reject: 'Rejected', // Todo: gettextCatalog diff --git a/src/pages/txp-details/txp-details.html b/src/pages/txp-details/txp-details.html index fc29e66e8..433f2dcd6 100644 --- a/src/pages/txp-details/txp-details.html +++ b/src/pages/txp-details/txp-details.html @@ -5,7 +5,7 @@ @@ -70,7 +70,7 @@
Recipients {{tx.recipientCount}} - +
@@ -153,8 +153,10 @@ {{'To'|translate}} - {{tx.paypro.domain}} - {{tx.paypro.domain}} + + {{tx.paypro.domain}} + + {{tx.paypro.domain}} @@ -191,7 +193,7 @@
!
-
{{actionList.length - i}}
+
{{actionList.length - i}}
{{a.description}}
diff --git a/src/pages/txp-details/txp-details.scss b/src/pages/txp-details/txp-details.scss index c1765d7f9..275ac0659 100644 --- a/src/pages/txp-details/txp-details.scss +++ b/src/pages/txp-details/txp-details.scss @@ -93,10 +93,10 @@ page-txp-details { margin-right: .5rem; position: relative; - &::before { + .line::before { content: ''; background: #e8e8e8; - height: 100px; + height: 42px; width: 1px; position: absolute; left: 50%; @@ -105,18 +105,6 @@ page-txp-details { top: 0; } - &::after { - content: ''; - background: #e8e8e8; - height: 100px; - width: 1px; - position: absolute; - left: 50%; - -webkit-transform: translateX(-50%) translateY(100%); - transform: translateX(-50%) translateY(100%); - bottom: 0; - } - > div { border: 3px solid $v-success-color; border-radius: $v-icon-border-radius;