mirror of https://github.com/BTCPrivate/copay.git
Display backup message in addressbook
This commit is contained in:
parent
5febc0d704
commit
8a3624907b
|
@ -63,7 +63,12 @@
|
||||||
ng-style="{'background-color':w.color}">
|
ng-style="{'background-color':w.color}">
|
||||||
<i class="icon-wallet size-21"></i>
|
<i class="icon-wallet size-21"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="ellipsis name-wallet text-bold">{{w.name || w.id}}</div>
|
<div class="ellipsis name-wallet text-bold">{{w.name || w.id}}
|
||||||
|
<span class="has-error right text-light size-12" ng-show="w.needsBackup">
|
||||||
|
<i class="icon-close-circle size-14"></i>
|
||||||
|
<span class="vm" translate>Needs backup</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
<div class="size-12">{{w.m}} of {{w.n}}
|
<div class="size-12">{{w.m}} of {{w.n}}
|
||||||
<span ng-show="w.network=='testnet'">[Testnet]</span>
|
<span ng-show="w.network=='testnet'">[Testnet]</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -420,11 +420,7 @@
|
||||||
<i class="icon-close-circle size-14"></i>
|
<i class="icon-close-circle size-14"></i>
|
||||||
<span class="vm" translate>Not valid</span>
|
<span class="vm" translate>Not valid</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="has-error right size-12" ng-show="home.destinationWalletNeedsBackup">
|
<small class="right text-primary" ng-show="!sendForm.address.$invalid">
|
||||||
<i class="icon-close-circle size-14"></i>
|
|
||||||
<span class="vm" translate>Destination wallet needs backup</span>
|
|
||||||
</span>
|
|
||||||
<small class="right text-primary" ng-show="!sendForm.address.$invalid && !home.destinationWalletNeedsBackup">
|
|
||||||
<i class="icon-checkmark-circle size-14"></i>
|
<i class="icon-checkmark-circle size-14"></i>
|
||||||
</small>
|
</small>
|
||||||
</span>
|
</span>
|
||||||
|
@ -508,7 +504,7 @@
|
||||||
<a fast-click callback-fn="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
|
<a fast-click callback-fn="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
|
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
|
||||||
<button class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || home.destinationWalletNeedsBackup"
|
<button class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
|
||||||
ng-style="{'background-color':index.backgroundColor}" fast-click callback-fn="home.submitForm()" translate>
|
ng-style="{'background-color':index.backgroundColor}" fast-click callback-fn="home.submitForm()" translate>
|
||||||
Send
|
Send
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -603,10 +603,6 @@ ul.manage li {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.name-wallet i {
|
|
||||||
color: #B6E9DF;
|
|
||||||
}
|
|
||||||
|
|
||||||
.locked {
|
.locked {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
color: #7A8C9E;
|
color: #7A8C9E;
|
||||||
|
|
|
@ -128,6 +128,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
|
self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
|
||||||
self.externalSource = fc.getPrivKeyExternalSourceName();
|
self.externalSource = fc.getPrivKeyExternalSourceName();
|
||||||
self.account = fc.credentials.account;
|
self.account = fc.credentials.account;
|
||||||
|
self.needsBackup = profileService.isBackupNeeded(self.walletId);
|
||||||
|
|
||||||
if (self.externalSource == 'trezor')
|
if (self.externalSource == 'trezor')
|
||||||
self.account++;
|
self.account++;
|
||||||
|
@ -152,8 +153,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
profileService.isBackupNeeded(self.walletId, function(needsBackup) {
|
|
||||||
self.needsBackup = needsBackup;
|
|
||||||
self.openWallet(function() {
|
self.openWallet(function() {
|
||||||
if (!self.isComplete) {
|
if (!self.isComplete) {
|
||||||
$log.debug('Wallet not complete after update... redirecting');
|
$log.debug('Wallet not complete after update... redirecting');
|
||||||
|
@ -166,7 +165,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.setCustomBWSFlag = function() {
|
self.setCustomBWSFlag = function() {
|
||||||
|
|
|
@ -130,7 +130,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
var confirm_msg = gettextCatalog.getString('Confirm');
|
var confirm_msg = gettextCatalog.getString('Confirm');
|
||||||
|
|
||||||
this.openDestinationAddressModal = function(wallets, address) {
|
this.openDestinationAddressModal = function(wallets, address) {
|
||||||
self.destinationWalletNeedsBackup = null;
|
|
||||||
$rootScope.modalOpened = true;
|
$rootScope.modalOpened = true;
|
||||||
var fc = profileService.focusedClient;
|
var fc = profileService.focusedClient;
|
||||||
self.lockAddress = false;
|
self.lockAddress = false;
|
||||||
|
@ -261,11 +260,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
profileService.isBackupNeeded(walletId, function(needsBackup) {
|
|
||||||
self.destinationWalletNeedsBackup = needsBackup;
|
|
||||||
$modalInstance.close(addr);
|
$modalInstance.close(addr);
|
||||||
});
|
});
|
||||||
});
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -856,7 +852,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
};
|
};
|
||||||
|
|
||||||
this.submitForm = function() {
|
this.submitForm = function() {
|
||||||
if (!$scope._amount || !$scope._address || self.destinationWalletNeedsBackup) return;
|
if (!$scope._amount || !$scope._address) return;
|
||||||
var fc = profileService.focusedClient;
|
var fc = profileService.focusedClient;
|
||||||
var unitToSat = this.unitToSatoshi;
|
var unitToSat = this.unitToSatoshi;
|
||||||
var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
|
var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
|
||||||
|
@ -988,7 +984,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
this.resetForm = function() {
|
this.resetForm = function() {
|
||||||
this.resetError();
|
this.resetError();
|
||||||
this.destinationWalletNeedsBackup = null;
|
|
||||||
this._paypro = null;
|
this._paypro = null;
|
||||||
this.lockedCurrentFeePerKb = null;
|
this.lockedCurrentFeePerKb = null;
|
||||||
|
|
||||||
|
|
|
@ -181,18 +181,6 @@ angular.module('copayApp.services')
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
root.isBackupNeeded = function(walletId, cb) {
|
|
||||||
var c = root.getClient(walletId);
|
|
||||||
if (c.isPrivKeyExternal()) return cb(false);
|
|
||||||
if (!c.credentials.mnemonic) return cb(false);
|
|
||||||
if (c.credentials.network == 'testnet') return cb(false);
|
|
||||||
|
|
||||||
storageService.getBackupFlag(walletId, function(err, val) {
|
|
||||||
if (err || val) return cb(false);
|
|
||||||
return cb(true);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
root._seedWallet = function(opts, cb) {
|
root._seedWallet = function(opts, cb) {
|
||||||
opts = opts || {};
|
opts = opts || {};
|
||||||
if (opts.bwsurl)
|
if (opts.bwsurl)
|
||||||
|
@ -680,6 +668,14 @@ angular.module('copayApp.services')
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
root.isBackupNeeded = function(walletId) {
|
||||||
|
var c = root.getClient(walletId);
|
||||||
|
if (c.isPrivKeyExternal()) return false;
|
||||||
|
if (!c.credentials.mnemonic) return false;
|
||||||
|
if (c.credentials.network == 'testnet') return false;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
root.getWallets = function(network) {
|
root.getWallets = function(network) {
|
||||||
if (!root.profile) return [];
|
if (!root.profile) return [];
|
||||||
|
|
||||||
|
@ -694,7 +690,8 @@ angular.module('copayApp.services')
|
||||||
id: c.walletId,
|
id: c.walletId,
|
||||||
network: c.network,
|
network: c.network,
|
||||||
color: config.colorFor[c.walletId] || '#4A90E2',
|
color: config.colorFor[c.walletId] || '#4A90E2',
|
||||||
copayerId: c.copayerId
|
copayerId: c.copayerId,
|
||||||
|
needsBackup: root.isBackupNeeded(c.walletId)
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
if (network) {
|
if (network) {
|
||||||
|
|
Loading…
Reference in New Issue