From de3ea7846b1d4e384ff8bcebc03f2008ffddfb7d Mon Sep 17 00:00:00 2001 From: Gabriel Masclef Date: Fri, 16 Feb 2018 15:49:53 -0300 Subject: [PATCH] Fix: integrations views --- .../amazon-card-details.html | 43 +++--- .../amazon-card-details.scss | 12 +- .../amazon-card-details.ts | 6 +- src/pages/integrations/amazon/amazon.html | 139 +++++++++--------- src/pages/integrations/amazon/amazon.scss | 3 + .../mercado-libre/mercado-libre.html | 117 ++++++++------- .../mercado-libre/mercado-libre.scss | 4 +- .../shapeshift-details/shapeshift-details.ts | 2 +- .../integrations/shapeshift/shapeshift.html | 82 +++++------ .../integrations/shapeshift/shapeshift.scss | 3 + 10 files changed, 203 insertions(+), 208 deletions(-) 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 991c0d581..af29bffa8 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 @@ -1,17 +1,14 @@ - Details - - -
Amazon.com Gift Card @@ -69,11 +66,11 @@
-
+
There was a failure to the create gift card. Please, contact BitPay support.
- + To redeem your gift card, follow these steps: @@ -97,26 +94,20 @@ www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

- -
- * - 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/amazon/amazon-card-details/amazon-card-details.scss b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.scss index 9482e29de..477652730 100644 --- a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.scss +++ b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.scss @@ -19,14 +19,14 @@ page-amazon-card-details { ion-item { padding: 0px 16px 0px 16px; } - .steps-info { - font-size: 12px; - white-space: normal; - color: #666; - line-height: 22px; - } button { text-align: center; } } + .steps-info { + font-size: 12px; + white-space: normal; + color: #666; + line-height: 22px; + } } diff --git a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts index 6ed85ff5f..736813a2e 100644 --- a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts +++ b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts @@ -55,7 +55,7 @@ export class AmazonCardDetailsPage { this.amazonProvider.savePendingGiftCard(this.card, { remove: true }, (err: any) => { - this.cancel(); + this.close(); }); } @@ -84,7 +84,7 @@ export class AmazonCardDetailsPage { this.amazonProvider.savePendingGiftCard(newData, { remove: true }, (err: any) => { - this.cancel(); + this.close(); }); return; } @@ -100,7 +100,7 @@ export class AmazonCardDetailsPage { }); } - public cancel(): void { + public close(): void { this.viewCtrl.dismiss(); } diff --git a/src/pages/integrations/amazon/amazon.html b/src/pages/integrations/amazon/amazon.html index cce0265ca..c709ebb6f 100644 --- a/src/pages/integrations/amazon/amazon.html +++ b/src/pages/integrations/amazon/amazon.html @@ -1,81 +1,78 @@ - Amazon.com Gift Cards - - -
- Sandbox version. Only for testing purpose. -
-
- - +
+
+ Sandbox version. Only for testing purpose. +
+ + + + Your cards + + + +
+ * + 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/amazon/amazon.scss b/src/pages/integrations/amazon/amazon.scss index c5b8f604f..295bc51be 100644 --- a/src/pages/integrations/amazon/amazon.scss +++ b/src/pages/integrations/amazon/amazon.scss @@ -3,6 +3,9 @@ page-amazon { background: #f4a460; margin: 0rem; } + .container { + height: 100%; + } .center-header { height: 100%; display: flex; diff --git a/src/pages/integrations/mercado-libre/mercado-libre.html b/src/pages/integrations/mercado-libre/mercado-libre.html index 13525352e..430faf7a3 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre.html +++ b/src/pages/integrations/mercado-libre/mercado-libre.html @@ -1,67 +1,66 @@ - {{'Mercado Livre Brazil Gift Cards'|translate}}s - - -
- Sandbox version. Only for testing purpose. -
-
- +
+
+
+ Sandbox version. Only for testing purpose. +
+ + + + + {{'Your Gift Cards'|translate}} + + +
+ \ No newline at end of file diff --git a/src/pages/integrations/mercado-libre/mercado-libre.scss b/src/pages/integrations/mercado-libre/mercado-libre.scss index 52a54259a..ac5d5b152 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre.scss +++ b/src/pages/integrations/mercado-libre/mercado-libre.scss @@ -3,7 +3,9 @@ page-mercado-libre { background: #ffc900; margin: 0rem; } - + .container { + height: 100%; + } .center-header { height: 100%; display: flex; diff --git a/src/pages/integrations/shapeshift/shapeshift-details/shapeshift-details.ts b/src/pages/integrations/shapeshift/shapeshift-details/shapeshift-details.ts index 0ac469d5f..4c2607d23 100644 --- a/src/pages/integrations/shapeshift/shapeshift-details/shapeshift-details.ts +++ b/src/pages/integrations/shapeshift/shapeshift-details/shapeshift-details.ts @@ -32,7 +32,7 @@ export class ShapeshiftDetailsPage { this.shapeshiftProvider.saveShapeshift(this.ssData, { remove: true }, function (err) { - this.cancel(); + this.close(); }); } diff --git a/src/pages/integrations/shapeshift/shapeshift.html b/src/pages/integrations/shapeshift/shapeshift.html index 1dd25fbcf..9c1d49e0d 100644 --- a/src/pages/integrations/shapeshift/shapeshift.html +++ b/src/pages/integrations/shapeshift/shapeshift.html @@ -4,47 +4,47 @@ - -
- Shapeshift -
-

The Safest, Fastest Asset Exchange on Earth

-

Trade any leading blockchain asset for any other. Protection by Design. No Account Needed.

-
- - -
- - - - - -
- - -
- - - Transactions - - + + +
+ + +
+
+ + +
+ + + Transactions + + +
@@ -52,4 +52,4 @@ Contact the ShapeShift support team. - + \ No newline at end of file diff --git a/src/pages/integrations/shapeshift/shapeshift.scss b/src/pages/integrations/shapeshift/shapeshift.scss index 2a08266f6..ec522eda0 100644 --- a/src/pages/integrations/shapeshift/shapeshift.scss +++ b/src/pages/integrations/shapeshift/shapeshift.scss @@ -1,4 +1,7 @@ page-shapeshift { + .container { + height: 100%; + } .center-header { h4 { color: color($colors, light);