Merge

src/sass/buttons.scss

@@ -1,5 +1,5 @@
 %button-standard {
-  width: 85%;
+  width: 90%;
   max-width: 300px;
   margin-left: auto;
   margin-right: auto;

src/sass/components/fee-summary.scss

@@ -1,11 +1,11 @@
 .fee-summary {
-  position: relative;
+  background-color: #F2F2F2;
+  box-sizing: border-box;
   display: flex;
   flex-direction: column;
-  width: 100%;
   padding: 5px 12px 15px;
-  box-sizing: border-box;
-  background-color: #F2F2F2;
+  position: relative;
+  width: 100%;
 
   &:before {
     content: '';
@@ -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;
     }
   }
 }

src/sass/components/item.scss

@@ -27,6 +27,7 @@
           left: 13px;
           top: 50%;
           padding: 0;
+          -webkit-transform: translate(0,-50%);
           transform: translate(0,-50%);
         }
       }

src/sass/mixins/layout.scss

@@ -59,6 +59,8 @@
     .button {
       font-weight: bold;
       font-size: 19px;
+      line-height: 26px;
+      padding: 8px 6px;
     }
   }
   .button-first-contact img {

src/sass/views/amount.scss

@@ -350,6 +350,7 @@
             .primary-amount-display {
               margin-right: 5px;
               word-break: break-all;
+              width: 100%;
             }
           }
 

src/sass/views/review.scss

@@ -6,8 +6,10 @@
   }
 
   .fee-summary {
-    position: absolute;
     bottom: 92px;
+    bottom: calc(92px + constant(safe-area-inset-bottom)); /* iOS 11.0 */
+    bottom: calc(92px + env(safe-area-inset-bottom)); /* iOS 11.2 */
+    position: absolute;
   }
 
   .shapeshift-banner, .bitpay-banner, .egifter-banner {
@@ -17,4 +19,5 @@
   .warning {
     color: $v-warning-color-2;
   }
+
 }

src/sass/views/tab-home.scss

@@ -83,14 +83,14 @@
     .button {
       border: 2px solid;
       border-radius: 47px;
-      padding: 0 15px 0 15px;
+      padding: 8px 2px 8px 2px;
       text-align: center;
       width: 100%;
       max-width: 300px;
       font-size: 19px;
       font-weight: bolder;
-      min-height: auto;
-      line-height: 36px;
+      min-height: 0;
+      line-height: 19px;
     }
   }
   .wallet-coin-logo {
@@ -173,6 +173,11 @@
       font-weight: 700;
       color: #444;
     }
+    .release-notes {
+      white-space: pre;
+      white-space: pre-line;
+      text-align: left;
+    }
     .button {
       width: 100%;
       border: none;
@@ -190,3 +195,13 @@
     top:11px;
   }
 }
+.popup-update {
+  .popup-buttons {
+    display: block;
+  }
+  .popup-buttons .button{
+    display:block;
+    min-width: 100% !important;
+    margin-top: 4px;
+  }
+}

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;

src/sass/views/tab-send.scss

@@ -105,7 +105,7 @@
           width: auto;
           margin: 2px 0 4px;
         }
-        height: 60px;
+        min-height: 65px;
         line-height: 16px;
         margin-right: 0px;
         width: 95%;

src/sass/views/walletDetails.scss

@@ -1,3 +1,4 @@
+$wallet-details-collapse-transition: all 0.25s ease-in-out;
 .wallet-details {
   &__tx-amount {
     font-size: 16px;
@@ -137,6 +138,20 @@
       margin-top: 20px;
       margin-top: env(safe-area-inset-top);
     }
+    &.collapse {
+      ion-content {
+        margin-top: 40px;
+      }
+      .amount {
+        &__scale, &__error {
+          -webkit-transform: scale3d(0.5, 0.5, 0.5) translateY(0px);
+          transform: scale3d(0.5, 0.5, 0.5) translateY(0px);
+        }
+      }
+      .amount-alternative, .send-receive-buttons, .wallet-details-wallet-info {
+        opacity: 0;
+      }
+    }
   }
   .bar-header {
     border: 0;
@@ -152,13 +167,14 @@
   background-color: inherit !important;
   }
   ion-content {
-
-    &.collapsible {
-      margin-top: 230px;
-    }
-
     padding-top: 0;
     top: 0;
+    transition: $wallet-details-collapse-transition;
+
+    margin-top: 185px;
+    @media only screen and (max-height:500px) {
+      margin-top: 165px;
+    }
     margin-bottom: 16px;
 
     .scroll {
@@ -199,7 +215,7 @@
       width: 100%;
       position: absolute;
       bottom: 20px;
-
+      transition: $wallet-details-collapse-transition;
       >.col {
         padding: 5px 10px;
         margin-bottom: 0;
@@ -207,30 +223,37 @@
       .button {
         border: 2px solid;
         border-radius: 47px;
-        padding: 0 15px 0 15px;
+        padding: 6px 2px 6px 2px;
         text-align: center;
         width: 100%;
         max-width: 300px;
         font-size: 19px;
         font-weight: bolder;
-        min-height: auto;
-        line-height: 36px;
+        min-height: 0;
+        line-height: 19px;
       }
     }
   }
   .amount {
-    width: 100%;
-    text-align: center;
-    color: #fff;
-    height: 230px;
-    padding-top: 40px;
-    display: block;
     align-items: center;
+    color: #fff;
+    display: block;
+
+    height: 230px;
+    @media only screen and (max-height:500px) {
+      height: 210px;
+    }
+
     justify-content: center;
+    padding-top: 40px;
+    text-align: center;
+    transition: $wallet-details-collapse-transition;
+    width: 100%;
 
     &__balance {
       -webkit-transform: scale3d(1, 1, 1) translateY(45px);
       transform: scale3d(1, 1, 1) translateY(45px);
+      transition: $wallet-details-collapse-transition;
     }
 
     &__updating {
@@ -240,6 +263,7 @@
 
     &-alternative {
       line-height: 36px;
+      transition: $wallet-details-collapse-transition;
     }
 
     &__button-balance {
@@ -255,6 +279,7 @@
     &__error {
       font-size: 14px;
       padding: 35px 20px;
+      opacity: 1;
     }
 
   }