diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index e203ad69a..d0be0de6f 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -18,7 +18,6 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, }; root.formatAmountStr = function(wallet, satoshis) { -console.log('[txFormatService.js:20]',wallet); //TODO/ if (isNaN(satoshis)) return; return root.formatAmount(satoshis) + ' ' + wallet.chain; }; diff --git a/www/img/icon-bch.svg b/www/img/icon-bch.svg new file mode 100644 index 000000000..b02172ceb --- /dev/null +++ b/www/img/icon-bch.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/www/img/icon-btc.svg b/www/img/icon-btc.svg new file mode 100644 index 000000000..da480b629 --- /dev/null +++ b/www/img/icon-btc.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/www/img/icon-wallet-testnet.svg b/www/img/icon-wallet-testnet.svg new file mode 100644 index 000000000..c1759c599 --- /dev/null +++ b/www/img/icon-wallet-testnet.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index ded0aca93..25e89148e 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -29,7 +29,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyCoinbase.html b/www/views/buyCoinbase.html index 8ae1999a0..8311c7398 100644 --- a/www/views/buyCoinbase.html +++ b/www/views/buyCoinbase.html @@ -38,7 +38,7 @@
Receive in
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyGlidera.html b/www/views/buyGlidera.html index df8e386e9..6959af141 100644 --- a/www/views/buyGlidera.html +++ b/www/views/buyGlidera.html @@ -30,7 +30,7 @@
Receive in
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/buyMercadoLibre.html b/www/views/buyMercadoLibre.html index 7791aee82..d132bb27d 100644 --- a/www/views/buyMercadoLibre.html +++ b/www/views/buyMercadoLibre.html @@ -28,7 +28,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/confirm.html b/www/views/confirm.html index a2b85ad88..831d3182c 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -65,7 +65,7 @@ From
- +
{{wallet.name}}
diff --git a/www/views/customAmount.html b/www/views/customAmount.html index 6cd7be9c3..3705c7cd9 100644 --- a/www/views/customAmount.html +++ b/www/views/customAmount.html @@ -39,7 +39,7 @@
- + {{wallet.name}}
diff --git a/www/views/includes/walletItem.html b/www/views/includes/walletItem.html index e087e1410..9d86fb573 100644 --- a/www/views/includes/walletItem.html +++ b/www/views/includes/walletItem.html @@ -1,6 +1,6 @@
- +
{{wallet.name || wallet.id}} diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index 28b77830f..13e4e2860 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -7,7 +7,7 @@ ng-click="selectWallet(w)" > - +
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index 144202699..01d0eb88f 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -74,7 +74,7 @@ From
- +
{{wallet.name}}
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html index 81b84ba41..12d862685 100644 --- a/www/views/paperWallet.html +++ b/www/views/paperWallet.html @@ -24,7 +24,7 @@
- + {{wallet.name || wallet.id}} diff --git a/www/views/sellCoinbase.html b/www/views/sellCoinbase.html index 5827efda6..0dbc97ac9 100644 --- a/www/views/sellCoinbase.html +++ b/www/views/sellCoinbase.html @@ -29,7 +29,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/sellGlidera.html b/www/views/sellGlidera.html index cb354bac0..b4409a13f 100644 --- a/www/views/sellGlidera.html +++ b/www/views/sellGlidera.html @@ -30,7 +30,7 @@
From
- + {{wallet ? wallet.name : '...'}}
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 0af9df0cd..9deef5e39 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -81,7 +81,7 @@ class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet" ng-click="openWallet(wallet)"> - + {{wallet.name || wallet.id}} diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 7f42ab857..7e198ad1d 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -63,7 +63,7 @@