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

fix incomplete wallet process

Browse source
This commit is contained in:
Javier 2016-09-06 11:22:10 -03:00
commit b6bcc57cfd
8 changed files with 96 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

19
public/views/copayers.html
View file

@ -1,15 +1,12 @@
<ion-view ng-controller="copayersController">
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content delegate-handle="my-handle" overflow-scroll="true">
<ion-content ng-controller="copayersController">
<div ng-show="!wallet.notAuthorized">
<h1 class="text-center" translate>Share this invitation with your copayers</h1>
@ -43,14 +40,14 @@
[ <span translate>{{wallet.m}}-of-{{wallet.n}}</span> ]
</span>
</h4>
<div class="white line-b p10" ng-include="'views/includes/copayers.html'"></div>
<div ng-include="'views/includes/copayers.html'"></div>
<div ng-if="!wallet.isComplete()" class="line-b p10 white size-12">
<i class="fi-loop m5r p10l"></i>
<i class="icon ion-loop"></i>
<span translate>Waiting...</span>
</div>
<div ng-if="wallet.isComplete()" class="line-b p10 white size-12" href>
<button class="button" href ui-sref="tabs.home">
<button class="button" href ui-sref="tabs.home">
<span translate>WALLET COMPLETE!</span>
</button>
</div>

14
public/views/includes/copayers.html
View file

@ -1,10 +1,8 @@
<ul class="no-bullet m0">
<li class="" ng-repeat="copayer in index.copayers">
<span class="size-12" ng-show="copayer.id == index.copayerId">
<i class="fi-check m5r"></i> {{'Me'|translate}}
<div ng-repeat="copayer in copayers">
<span class="item size-12" ng-show="copayer.id == wallet.copayerId">
<i class="icon ion-checkmark"></i> {{'Me'|translate}}
</span>
<span class="size-12 text-gray" ng-show="copayer.id != index.copayerId">
<i class="fi-check m5r"></i> {{copayer.name}}
<span class="item size-12 text-gray" ng-show="copayer.id != wallet.copayerId">
<i class="icon ion-checkmark"></i> {{copayer.name}}
</span>
</li>
</ul>
</div>

2
public/views/tab-home.html
View file

@ -40,7 +40,7 @@
</div>
<a ng-repeat="wallet in wallets track by $index"
class="item item-icon-left item-big-icon-left item-icon-right"
ui-sref="tabs.details({'walletId': wallet.id})">
ng-click="openWallet(wallet)">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}"/>
</i>

17
public/views/walletDetails.html
View file

@ -10,22 +10,7 @@
</ion-header-bar>
<ion-content delegate-handle="my-handle">
<div ng-show="!wallet" translate>
No Wallet
<a href ui-sref="tabs.home" class="button" translate>
Go home
</a>
</div>
<div ng-show="!wallet.isComplete()">
<a class="button button-block button-assertive" href ui-sref="wallet.copayers" class="button" translate>
Wallet Incomplete
</a>
</div>
<div class="oh pr" ng-show="wallet && wallet.isComplete()">
<div class="oh pr" ng-show="wallet && wallet.isComplete()">
<div ng-style="{'background-color':wallet.color}" class="amount">
<div ng-if="!notAuthorized && !updatingStatus">