+
+
{{send.error|translate}}
-
×
-
-
-
-
-
-
- {{success|translate}}
-
-
×
+
×
diff --git a/src/css/main.css b/src/css/main.css
index 6c7eb93b6..b1ff6d95f 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -163,8 +163,8 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.box-notification {
position: relative;
font-size: 12px;
- padding: 0.7rem 3rem;
- border-radius: 4px;
+ padding: 0.5rem 2rem 0.5rem 0.7rem;
+ border-radius: 2px;
background: #F2F5F8;
margin: 0 auto;
margin-bottom: 1.6rem;
@@ -198,10 +198,9 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
a.close-notification {
position: absolute;
- top: 0;
- right: 0;
+ top: -4px;
+ right: 10px;
font-size: 24px;
- padding: 10px;
}
ul.tx-copayers {
@@ -597,7 +596,6 @@ button.outline:hover,
button.outline:focus {
border-radius: 3px;
background: transparent;
- text-transform: none;
}
.button.outline.dark-gray,
diff --git a/src/css/mobile.css b/src/css/mobile.css
index ccacf8922..c0d572796 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -521,15 +521,15 @@ a.pin-button:active {
}
.dr-notification-content {
- line-height: 100%;
- padding: 7px 50px 5px 60px;
+ line-height: 90%;
+ padding: 10px 50px 5px 60px;
}
.dr-notification-title {
color: #fff;
- font-size: 14px;
+ font-size: 12px;
margin-bottom: 0;
- font-weight: 500;
+ font-weight: 700;
}
.dr-notification {
@@ -545,7 +545,7 @@ a.pin-button:active {
}
.dr-notification-text {
- font-size: 12px;
+ font-size: 11px;
color: #fff;
}
diff --git a/src/js/controllers/send.js b/src/js/controllers/send.js
index 283c8d40f..f61b7a716 100644
--- a/src/js/controllers/send.js
+++ b/src/js/controllers/send.js
@@ -5,6 +5,10 @@ angular.module('copayApp.controllers').controller('sendController',
var fc = profileService.focusedClient;
var self = this;
+ this.resetError = function() {
+ this.error = this.success = null;
+ };
+
this.init = function() {
this.isMobile = isMobile.any();
this.isWindowsPhoneApp = isMobile.Windows() && isCordova;
@@ -12,7 +16,7 @@ angular.module('copayApp.controllers').controller('sendController',
$rootScope.title = fc.credentials.m > 1 ? 'Send Proposal' : 'Send';
this.blockUx = false;
- this.error = this.success = null;
+ this.resetError();
this.isRateAvailable = false;
this.showScanner = false;
@@ -106,6 +110,7 @@ angular.module('copayApp.controllers').controller('sendController',
$scope.__alternative = 0;
}
self.alternativeAmount = $scope.__alternative;
+ self.resetError();
},
enumerable: true,
configurable: true
@@ -272,8 +277,10 @@ angular.module('copayApp.controllers').controller('sendController',
}
};
+
+
this.resetForm = function(form) {
- this.error = this.success = null;
+ this.resetError();
this.fetchingURL = null;
this._paypro = null;
@@ -395,7 +402,7 @@ angular.module('copayApp.controllers').controller('sendController',
};
this.onAddressChange = function(value) {
- this.error = this.success = null;
+ this.resetError();
if (!value) return '';
if (this._paypro)