diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js index 3f4db0ef9..830bed677 100644 --- a/src/js/directives/slideToAccept.js +++ b/src/js/directives/slideToAccept.js @@ -116,7 +116,8 @@ angular.module('copayApp.directives') function getTransformStyle(translatePct) { return { - 'transform': 'translateX(' + translatePct + '%)' + 'transform': 'translateX(' + translatePct + '%)', + '-webkit-transform': 'translateX(' + translatePct + '%)' }; } diff --git a/src/sass/components/fee-summary.scss b/src/sass/components/fee-summary.scss index 5c9488b60..88c43ab02 100644 --- a/src/sass/components/fee-summary.scss +++ b/src/sass/components/fee-summary.scss @@ -18,12 +18,11 @@ } .amount { - display: flex; - flex-direction: row; - justify-content: space-between; width: 100%; .fee-fiat { + display: inline; + &.positive { color: #70955F; } @@ -35,6 +34,7 @@ .fee-crypto { color: #A7A7A7; + float: right; } } } \ No newline at end of file diff --git a/src/sass/components/item.scss b/src/sass/components/item.scss index bb75ae8e0..a6ac4143c 100644 --- a/src/sass/components/item.scss +++ b/src/sass/components/item.scss @@ -27,6 +27,7 @@ left: 13px; top: 50%; padding: 0; + -webkit-transform: translate(0,-50%); transform: translate(0,-50%); } } diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index bf4d3506a..aba2fe6d9 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -350,6 +350,7 @@ .primary-amount-display { margin-right: 5px; word-break: break-all; + width: 100%; } } diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss index 474e1ea3f..d4f02f2f4 100644 --- a/src/sass/views/review.scss +++ b/src/sass/views/review.scss @@ -19,4 +19,5 @@ .warning { color: $v-warning-color-2; } + } \ No newline at end of file diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index f9ace4655..909bc5791 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -89,7 +89,7 @@ max-width: 300px; font-size: 19px; font-weight: bolder; - min-height: auto; + min-height: 0; line-height: 19px; } } diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 40dc79504..0b406254d 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -84,6 +84,9 @@ width: 100%; } .payment-received-container { + svg { + max-height: 400px; + } margin: 0 20px; .payment-received-amount { font-size: 1.8em; diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 6126c6b8b..e6cea609e 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -229,7 +229,7 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; max-width: 300px; font-size: 19px; font-weight: bolder; - min-height: auto; + min-height: 0; line-height: 19px; } } diff --git a/src/shim/shim.js b/src/shim/shim.js index 495848f05..6f9abc0ae 100644 --- a/src/shim/shim.js +++ b/src/shim/shim.js @@ -8,4 +8,56 @@ if (!ArrayBuffer['isView']) { ArrayBuffer.isView = function(a) { return a !== null && typeof(a) === "object" && a['buffer'] instanceof ArrayBuffer; }; +} + +// https://tc39.github.io/ecma262/#sec-array.prototype.includes +if (!Array.prototype.includes) { + Object.defineProperty(Array.prototype, 'includes', { + value: function(searchElement, fromIndex) { + + if (this == null) { + throw new TypeError('"this" is null or not defined'); + } + + // 1. Let O be ? ToObject(this value). + var o = Object(this); + + // 2. Let len be ? ToLength(? Get(O, "length")). + var len = o.length >>> 0; + + // 3. If len is 0, return false. + if (len === 0) { + return false; + } + + // 4. Let n be ? ToInteger(fromIndex). + // (If fromIndex is undefined, this step produces the value 0.) + var n = fromIndex | 0; + + // 5. If n ≥ 0, then + // a. Let k be n. + // 6. Else n < 0, + // a. Let k be len + n. + // b. If k < 0, let k be 0. + var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0); + + function sameValueZero(x, y) { + return x === y || (typeof x === 'number' && typeof y === 'number' && isNaN(x) && isNaN(y)); + } + + // 7. Repeat, while k < len + while (k < len) { + // a. Let elementK be the result of ? Get(O, ! ToString(k)). + // b. If SameValueZero(searchElement, elementK) is true, return true. + if (sameValueZero(o[k], searchElement)) { + return true; + } + // c. Increase k by 1. + k++; + } + + // 8. Return false + return false; + } + }); } \ No newline at end of file