mirror of https://github.com/BTCPrivate/copay.git
fix join message
This commit is contained in:
parent
065d3d62e1
commit
c5d3ff191a
|
@ -22,7 +22,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="onGoingProcess" ng-show="create.hwWallet">
|
<div class="onGoingProcess" ng-show="create.hwWallet">
|
||||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}" style="max-height:6.5em" >
|
||||||
<div class="spinner">
|
<div class="spinner">
|
||||||
<div class="rect1"></div>
|
<div class="rect1"></div>
|
||||||
<div class="rect2"></div>
|
<div class="rect2"></div>
|
||||||
|
@ -31,6 +31,7 @@
|
||||||
<div class="rect5"></div>
|
<div class="rect5"></div>
|
||||||
</div>
|
</div>
|
||||||
<span translate>Connecting to {{create.hwWallet}} Wallet...</span>
|
<span translate>Connecting to {{create.hwWallet}} Wallet...</span>
|
||||||
|
<span ng-show="create.hwWallet=='Trezor'" translate>Please accept to export two public keys from the Trezor app</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="onGoingProcess" ng-show="join.hwWallet">
|
<div class="onGoingProcess" ng-show="join.hwWallet">
|
||||||
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
|
<div class="onGoingProcess-content" ng-style="{'background-color':'#222'}" style="max-height:6.5em">
|
||||||
<div class="spinner">
|
<div class="spinner">
|
||||||
<div class="rect1"></div>
|
<div class="rect1"></div>
|
||||||
<div class="rect2"></div>
|
<div class="rect2"></div>
|
||||||
|
@ -29,6 +29,7 @@
|
||||||
<div class="rect5"></div>
|
<div class="rect5"></div>
|
||||||
</div>
|
</div>
|
||||||
<span translate>Connecting to {{join.hwWallet}} Wallet...</span>
|
<span translate>Connecting to {{join.hwWallet}} Wallet...</span>
|
||||||
|
<span ng-show="join.hwWallet=='Trezor'" translate>Please accept to export two public keys from the Trezor app</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -98,12 +99,9 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-show="join.seedSourceId == 'trezor' || join.seedSourceId == 'ledger'">
|
<div ng-show="join.seedSourceId == 'trezor' || join.seedSourceId == 'ledger'">
|
||||||
|
<label class="oh"><span translate>Account Number</span>
|
||||||
<label class="oh"><span translate>Account</span>
|
<input type="number" id="account" ng-model="account">
|
||||||
<select class="m10t" ng-model="account" ng-options="externalIndex as externalIndex for externalIndex in join.accountValues">
|
|
||||||
</select>
|
|
||||||
</label>
|
</label>
|
||||||
<div class="oh text-gray line-b size-12 p10b m20b"><span translate>Multiple wallets accounts are supported on the device simultaneously. Select which account should be used for this wallet</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-notification" ng-show="join.seedSourceId=='new' && createPassphrase">
|
<div class="box-notification" ng-show="join.seedSourceId=='new' && createPassphrase">
|
||||||
|
|
|
@ -92,6 +92,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.setSpendUnconfirmed();
|
self.setSpendUnconfirmed();
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
|
$rootScope.$apply();
|
||||||
self.hasProfile = true;
|
self.hasProfile = true;
|
||||||
self.noFocusedWallet = false;
|
self.noFocusedWallet = false;
|
||||||
self.onGoingProcess = {};
|
self.onGoingProcess = {};
|
||||||
|
@ -141,7 +142,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
var defaults = configService.getDefaults();
|
var defaults = configService.getDefaults();
|
||||||
var config = configService.getSync();
|
var config = configService.getSync();
|
||||||
|
|
||||||
self.usingCustomBWS = config.bwsFor && (config.bwsFor[self.walletId] != defaults.bws.url);
|
self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url);
|
||||||
};
|
};
|
||||||
|
|
||||||
self.setTab = function(tab, reset, tries, switchState) {
|
self.setTab = function(tab, reset, tries, switchState) {
|
||||||
|
|
|
@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
var defaults = configService.getDefaults();
|
var defaults = configService.getDefaults();
|
||||||
$scope.bwsurl = defaults.bws.url;
|
$scope.bwsurl = defaults.bws.url;
|
||||||
$scope.derivationPath = derivationPathHelper.default;
|
$scope.derivationPath = derivationPathHelper.default;
|
||||||
|
$scope.account = 1;
|
||||||
|
|
||||||
this.onQrCodeScanned = function(data) {
|
this.onQrCodeScanned = function(data) {
|
||||||
$scope.secret = data;
|
$scope.secret = data;
|
||||||
|
@ -43,7 +44,6 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
|
|
||||||
this.setSeedSource = function(src) {
|
this.setSeedSource = function(src) {
|
||||||
self.seedSourceId = $scope.seedSource.id;
|
self.seedSourceId = $scope.seedSource.id;
|
||||||
self.accountValues = lodash.range(1, 100);
|
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$rootScope.$apply();
|
$rootScope.$apply();
|
||||||
|
@ -55,7 +55,6 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
self.error = gettext('Please enter the required fields');
|
self.error = gettext('Please enter the required fields');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
self.loading = true;
|
|
||||||
|
|
||||||
var opts = {
|
var opts = {
|
||||||
secret: form.secret.$modelValue,
|
secret: form.secret.$modelValue,
|
||||||
|
@ -120,6 +119,7 @@ angular.module('copayApp.controllers').controller('joinController',
|
||||||
};
|
};
|
||||||
|
|
||||||
this._join = function(opts) {
|
this._join = function(opts) {
|
||||||
|
self.loading = true;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
profileService.joinWallet(opts, function(err) {
|
profileService.joinWallet(opts, function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in New Issue