'
}
});
-
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 86a6031f4..c065a94bf 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -23,10 +23,10 @@ angular.module('copayApp.services').factory('configService', function(storageSer
reconnectDelay: 5000,
idleDurationMin: 4,
settings: {
- unitName: 'bits',
+ unitName: 'BTC',
unitToSatoshi: 100,
unitDecimals: 2,
- unitCode: 'bit',
+ unitCode: 'btc',
alternativeName: 'US Dollar',
alternativeIsoCode: 'USD',
}
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index de2c29e98..3c210bcbc 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -601,6 +601,16 @@ angular.module('copayApp.services')
$log.debug('Importing Wallet:', opts);
try {
+ var c = JSON.parse(str);
+
+ if (c.xPrivKey && c.xPrivKeyEncrypted) {
+ $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version');
+ delete c.xPrivKeyEncrypted;
+ delete c.mnemonicEncrypted;
+ }
+
+ str = JSON.stringify(c);
+
walletClient.import(str, {
compressed: opts.compressed,
password: opts.password
@@ -609,14 +619,6 @@ angular.module('copayApp.services')
return cb(gettext('Could not import. Check input file and spending password'));
}
- str = JSON.parse(str);
-
- if (str.xPrivKey && str.xPrivKeyEncrypted) {
- $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version');
- delete str.xPrivKeyEncrypted;
- delete str.mnemonicEncrypted;
- }
-
var addressBook = str.addressBook || {};
addAndBindWalletClient(walletClient, {
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index dc5c62a96..bc1573d4b 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -52,6 +52,9 @@
position: absolute;
bottom: 254px;
top: 66px;
+ .light {
+ color: #A4A4A4;
+ }
}
}
@@ -84,7 +87,8 @@
.operator-send {
font-weight: bolder;
- background-color: #f7f7f7;
+ color: #f8f8f8;
+ background-color: #1e3186;
font-size: 36px;
cursor: pointer;
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index 30df5f1d0..8f087a9fc 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -1,6 +1,5 @@
#tab-home {
.icon-create-wallet {
- background-image: url("../img/icon-wallet.svg");
background-color: #4A90E2; // default wallet color
}
.icon-buy-bitcoin {
@@ -16,19 +15,17 @@
.icon-amazon {
background-image: url("../img/icon-amazon.svg");
}
+ .bg {
+ &.wallet{
+ padding: .25rem
+ }
+ }
.card{
.item {
color: #444;
border-top:none;
padding-bottom: 1.5rem;
padding-top:1.5rem;
- &.wallet{
- .big-icon-svg{
- & > .bg{
- padding: .25rem
- }
- }
- }
}
.item-sub {
&:first-child:before {
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index f3eea2550..e54502fb7 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -1,3 +1,30 @@
+.wallet-details {
+ &__tx-amount {
+ font-size: 16px;
+ &--recent {
+ color: $mid-gray;
+ font-weight: bold;
+ }
+ &--received {
+ color: #30af6c;
+ }
+ &--sent {
+ color: $dark-gray;
+ }
+ }
+ &__tx-time {
+ color: $light-gray;
+ }
+ &__tx-title {
+ padding-top: 10px;
+ color: $dark-gray;
+ }
+ &__tx-icon {
+ float: left;
+ margin-right: 10px;
+ }
+}
+
#walletDetails {
.bar-header {
border: 0;
@@ -31,23 +58,8 @@
.item.item-footer {
font-weight: lighter;
}
-}
-
-.wallet-details-release {
- cursor: pointer;
- cursor: hand;
- background-color: #E9E9EC;
- margin-top: -30px;
- margin-bottom: 5px;
- padding-top: 30px;
- padding-bottom: 20px;
- text-align: center;
- text-color: #444;
- span {
- margin-left: 15px;
- }
- i {
- margin-right: 15px;
+ .tx-search:before {
+ font-size: 22px !important;
}
}
diff --git a/www/img/icon-tx-moved.svg b/www/img/icon-tx-moved.svg
new file mode 100644
index 000000000..4f86c7722
--- /dev/null
+++ b/www/img/icon-tx-moved.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/www/img/icon-tx-received.svg b/www/img/icon-tx-received.svg
new file mode 100644
index 000000000..37d4d84c9
--- /dev/null
+++ b/www/img/icon-tx-received.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/www/img/icon-tx-sent.svg b/www/img/icon-tx-sent.svg
new file mode 100644
index 000000000..fc8148465
--- /dev/null
+++ b/www/img/icon-tx-sent.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/www/views/amount.html b/www/views/amount.html
index 29dd08a5d..11614da7a 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -35,15 +35,14 @@
-
{{amount || "0.00" }}
-
+
-
{{amount || "0.00" }}
+
{{globalResult}} {{amountResult || '0.00'}} {{alternativeIsoCode}}
{{globalResult}} {{alternativeResult || '0.00'}} {{unitName}}
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html
index 8dc95908e..88cb917b0 100644
--- a/www/views/buyAmazon.html
+++ b/www/views/buyAmazon.html
@@ -33,7 +33,7 @@
ng-submit="buy.confirm()"
novalidate>
-
+