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/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/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/tab-home.html b/www/views/tab-home.html index f22785035..5f528b3a9 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -64,49 +64,49 @@ -- - 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}} - - -
- +