Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into scanHandling

src/js/controllers/advancedSettings.js

@@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
     });
   };
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
     updateConfig();
   });
 

src/js/controllers/modals/txDetails.js

@@ -83,8 +83,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
       time: $scope.btx.time,
       description: actionDescriptions['broadcasted'],
     });
-
-    $scope.actionList.reverse();
   };
 
   $scope.showCommentPopup = function() {

src/js/controllers/modals/txpDetails.js

@@ -59,8 +59,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
         by: action.copayerName
       });
     });
-
-    $scope.actionList.reverse();
   };
 
   $scope.$on('accepted', function(event) {

src/js/controllers/preferencesAlias.js

@@ -23,4 +23,11 @@ angular.module('copayApp.controllers').controller('preferencesAliasController',
         $ionicHistory.goBack();
       });
     };
+    $scope.valueCheck = function() {
+      if ($scope.alias.value == wallet.credentials.walletName || $scope.alias.value == '') $scope.disableSave = true;
+      else $scope.disableSave = false;
+    };
+    $scope.$watch('alias.value', function(newvalue, oldvalue) {
+      $scope.valueCheck();
+    });
   });

src/sass/ionic.scss

@@ -30,3 +30,8 @@ $placeholder-icon-padding: 10px;
 .item-input-wrapper {
   background: none transparent;
 }
+
+// the default .item p color of #666 cannot be modified by a variable
+.item p {
+  color: $mid-gray;
+}

src/sass/variables.scss

@@ -5,6 +5,7 @@ $fill-blue: #D5DFFF;
 $subtle-gray: darken(#fff, 5%);
 $roboto: "Roboto", sans-serif;
 $roboto-light: "Roboto-Light", sans-serif-light;
+$light-green: rgb(19, 229, 182);
 $success-green: #17ae8c;
 $warning-orange: #ffa500;
 $dark-gray: #445;

src/sass/views/onboarding/terms-of-use.scss

@@ -1,3 +1,12 @@
+#terms {
+  .terms {
+    &__heading {
+      font-weight: bold;
+      color: $dark-gray;
+    }
+  }
+}
+
 #terms-of-use {
   ion-header-bar {
     background: #fff;
@@ -41,16 +50,16 @@
     }
     .checkbox input:checked:before,
     .checkbox input:checked + .checkbox-icon:before {
-      border-color: rgb(19, 229, 182);
+      border-color: $light-green;
     }
     .checkbox input:checked:after,
     input:checked + .checkbox-icon:after {
-      border-color: rgb(19, 229, 182);
+      border-color: $light-green;
       top: 20%;
       left: 11%;
     }
     .item {
-      color: rgb(58, 58, 58);
+      color: $dark-gray;
       padding-bottom: 1.2rem;
       padding-bottom: 2.5rem;
       float: left;
@@ -64,7 +73,7 @@
       }
     }
     p {
-      color: rgb(58, 58, 58);
+      color: $dark-gray;
     }
     .checkbox input:before,
     .checkbox .checkbox-icon:before {
@@ -72,7 +81,7 @@
     }
     .checkbox input:checked:before,
     .checkbox input:checked + .checkbox-icon:before {
-      border-color: rgb(19, 229, 182);
+      border-color: $light-green;
     }
     button {
       margin-top: 1.5rem;