anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix Conflicts:

Browse source 
js/controllers/join.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-06 18:55:44 -03:00
commit fd030ecbfb
5 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/join.js
View file

@ -1,9 +1,9 @@
'use strict';
angular.module('copayApp.controllers').controller('JoinController',
function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) {
controllerUtils.redirIfLogged();
$rootScope.fromSetup = false;
$scope.loading = false;
// QR code Scanner

1
js/controllers/open.js
View file

@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('OpenController',
v2 = o2.show.toLowerCase();
return v1 > v2 ? 1 : (v1 < v2) ? -1 : 0;
};
$rootScope.fromSetup = false;
$scope.loading = false;
$scope.wallets = walletFactory.getWallets().sort(cmp);
$scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id);

1
js/controllers/setup.js
View file

@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('SetupController',
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
controllerUtils.redirIfLogged();
$rootScope.fromSetup = true;
$rootScope.videoInfo = {};
$scope.loading = false;
$scope.walletPassword = $rootScope.walletPassword;

1
views/copayers.html
View file

@ -8,6 +8,7 @@
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
<div ng-if="!$root.wallet.publicKeyRing.isComplete()">
<img ng-if="$root.fromSetup" class="right m15t" src="../img/step-3.svg" alt="Step 3">
<h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
<h3>Share this secret with your other copayers</h3>
<div class="panel">

2
views/setup.html
View file

@ -12,6 +12,8 @@
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
<img ng-if="!isSetupWalletPage" class="right m15t" src="../img/step-1.svg" alt="Step 1">
<img ng-if="isSetupWalletPage" class="right m15t" src="../img/step-2.svg" alt="Step 2">
<h1 class="text-secondary line-sidebar-b">Create new wallet</h1>
<label ng-show="!isSetupWalletPage">Wallet name
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">