diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 4a1ce005a..b48eb770e 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -28,7 +28,7 @@ angular.module('copayApp.controllers').controller('createController',
$scope.formData.bwsurl = defaults.bws.url;
$scope.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
$scope.formData.derivationPath = derivationPathHelper.default;
- $scope.formData.coin = 'btc';
+ $scope.formData.coin = data.stateParams.coin;
if (config.cashSupport) $scope.enableCash = true;
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 4dfecf28a..f796b21f6 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('importController',
$scope.formData.bwsurl = defaults.bws.url;
$scope.formData.derivationPath = derivationPathHelper.default;
$scope.formData.account = 1;
- $scope.formData.coin = 'btc';
+ $scope.formData.coin = $stateParams.coin;
$scope.importErr = false;
$scope.isCopay = appConfigService.name == 'copay';
$scope.fromHardwareWallet = {
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 29b97cb6b..3a979b75e 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('joinController',
$scope.formData.derivationPath = derivationPathHelper.default;
$scope.formData.account = 1;
$scope.formData.secret = null;
- $scope.formData.coin = 'btc';
+ $scope.formData.coin = data.stateParams.coin;
if (config.cashSupport) $scope.enableCash = true;
resetPasswordFields();
updateSeedSourceSelect();
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 79be14391..508ff03ff 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -206,14 +206,24 @@ angular.module('copayApp.controllers').controller('tabHomeController',
};
var updateAllWallets = function() {
- $scope.wallets = profileService.getWallets();
- if (lodash.isEmpty($scope.wallets)) return;
+ var wallets = [];
+ $scope.walletsBtc = profileService.getWallets({coin: 'btc'});
+ $scope.walletsBch = profileService.getWallets({coin: 'bch'});
- var i = $scope.wallets.length;
+ lodash.each($scope.walletsBtc, function(wBtc) {
+ wallets.push(wBtc);
+ });
+
+ lodash.each($scope.walletsBch, function(wBch) {
+ wallets.push(wBch);
+ });
+
+ if (lodash.isEmpty(wallets)) return;
+
+ var i = wallets.length;
var j = 0;
- var timeSpan = 60 * 60 * 24 * 7;
- lodash.each($scope.wallets, function(wallet) {
+ lodash.each(wallets, function(wallet) {
walletService.getStatus(wallet, {}, function(err, status) {
if (err) {
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index 75cce161b..ee45ae002 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -6,7 +6,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.currentLanguageName = uxLanguage.getCurrentLanguageName();
$scope.feeOpts = feeService.feeOpts;
$scope.currentFeeLevel = feeService.getCurrentFeeLevel();
- $scope.wallets = profileService.getWallets();
+ $scope.walletsBtc = profileService.getWallets({ coin: 'btc' });
+ $scope.walletsBch = profileService.getWallets({ coin: 'bch' });
$scope.buyAndSellServices = buyAndSellService.getLinked();
configService.whenAvailable(function(config) {
diff --git a/src/js/routes.js b/src/js/routes.js
index f3de8ba00..e350b390c 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -329,6 +329,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
'tab-home@tabs': {
templateUrl: 'views/add.html'
}
+ },
+ params: {
+ coin: 'btc'
}
})
.state('tabs.add.join', {
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index d49c5ad4f..49e5a57a7 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -59,6 +59,10 @@
}
}
}
+ .wallet-coin-logo {
+ vertical-align: middle;
+ margin-right: 5px;
+ }
.wallet-details__item.item {
padding-top: 0;
padding-bottom: 0;
diff --git a/www/img/bitcoin-cash-logo.svg b/www/img/bitcoin-cash-logo.svg
new file mode 100644
index 000000000..eceada30a
--- /dev/null
+++ b/www/img/bitcoin-cash-logo.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html
index 3ea4d78c6..36c436ee8 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 fe1371ce9..f9878e922 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 5f1168996..a2dccf209 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 072bad8af..f45d1cb32 100644
--- a/www/views/buyMercadoLibre.html
+++ b/www/views/buyMercadoLibre.html
@@ -28,7 +28,7 @@
From
- ![]()
+ ![]()
{{wallet ? wallet.name : '...'}}
diff --git a/www/views/includes/walletIcon.html b/www/views/includes/walletIcon.html
index 2396ffa87..9991e0293 100644
--- a/www/views/includes/walletIcon.html
+++ b/www/views/includes/walletIcon.html
@@ -1,3 +1,2 @@
- 
- 
+ 
diff --git a/www/views/includes/walletList.html b/www/views/includes/walletList.html
new file mode 100644
index 000000000..102daffcb
--- /dev/null
+++ b/www/views/includes/walletList.html
@@ -0,0 +1,22 @@
+
+
+ {{wallet.name || wallet.id}}
+
+
+
+ Incomplete
+
+
+ {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}
+ Scanning funds...
+
+ [Balance Hidden]
+
+ {{wallet.m}}-of-{{wallet.n}}
+
+
+ {{wallet.error}}
+
+
+
+
diff --git a/www/views/includes/walletListSettings.html b/www/views/includes/walletListSettings.html
new file mode 100644
index 000000000..6264e11e9
--- /dev/null
+++ b/www/views/includes/walletListSettings.html
@@ -0,0 +1,14 @@
+
+
+ {{wallet.name || wallet.id}}
+
+ {{wallet.m}}-of-{{wallet.n}}
+
+
+
+ {{'Incomplete' | translate}}
+
+
+ {{'Backup needed' | translate}}
+
+
diff --git a/www/views/sellCoinbase.html b/www/views/sellCoinbase.html
index ae715ebe4..e553e84cb 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 e3ac25c31..7c23a558f 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 f22785035..ac9a563cc 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -64,49 +64,51 @@
- 
+ 
+