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

fix export/import

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-18 19:23:58 -03:00
commit 5435200968
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
6 changed files with 97 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

16
public/views/export.html
View file

@ -1,5 +1,5 @@
<ion-view ng-controller="exportController" cache-view="false" ng-init="init(index.prevState)">
<ion-view ng-controller="exportController" cache-view="false" ng-init="init()">
<ion-nav-bar class="bar-stable">
<ion-nav-title>Export Wallet</ion-nav-title>
<ion-nav-buttons side="primary">
@ -9,8 +9,10 @@
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div ng-show="!index.canSign"><h4></h4></div>
<div ng-show="index.canSign" class="create-tab small-only-text-center">
<h4>{{wallet.name}}</h4>
<div ng-show="!canSign"><h4></h4></div>
<div ng-show="canSign" class="create-tab small-only-text-center">
<div class="row">
<div class="tab-container small-6 columns"
ng-class="{'selected':!exportQR}"
@ -60,7 +62,7 @@
<div class="text-center size-12 m10" translate>Exporting via QR not supported for this wallet</div>
</div>
<div class="row" ng-show="!exportQR && index.canSign">
<div class="row" ng-show="!exportQR && canSign">
<div class="columns m15t">
<a class="button outline light-gray expand tiny p10i" ng-click="showAdvanced = !showAdvanced">
<i class="fi-widget m3r"></i>
@ -78,7 +80,7 @@
</ion-toggle>
</div>
<div class="box-notification p15l" ng-show="!index.canSign">
<div class="box-notification p15l" ng-show="!canSign">
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>
@ -100,12 +102,12 @@
<div class="columns">
<button class="black round expand m20t" ng-click="downloadWalletBackup()"
ng-disabled="(!password || password != repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-style="{'background-color':wallet.color}"
ng-show="!isSafari && !isCordova"><i class="fi-download"></i>
<span translate>Download</span></button>
<button class="black round expand m20t" ng-click="viewWalletBackup()"
ng-disabled="(!password || password != repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-style="{'background-color':wallet.color}"
ng-show="isSafari && !isCordova"><i class="fi-eye"></i>
<span translate>View</span></button>
<div ng-show="isCordova">

6
public/views/import.html
View file

@ -68,9 +68,9 @@
spellcheck="false"></textarea>
</label>
</div>
<div class="col text-center">
<qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
</div>
<div class="qr-scanner-input-import">
<qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
</div>
</div>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable">

37
public/views/preferencesInformation.html
View file

@ -12,12 +12,6 @@
<div class="item item-divider">
Wallet Information
</div>
<div class="item">
<span translate>BETA: Android Key Derivation Test:</span>
<span class="item-note">
{{androidTest}}
</span>
</div>
<div class="item" ng-click="saveBlack()">
<span translate>Wallet Name (at creation)</span>
<span class="item-note">
@ -54,22 +48,22 @@
{{derivationStrategy}}
</span>
</div>
<div class="item" ng-show="index.externalSource">
<div class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware Wallet</span>
<span class="item-note">
{{index.externalSource}}
{{wallet.getPrivKeyExternalSourceName()}}
</span>
</div>
<div class="item" ng-show="!index.externalSource && !index.canSign">
<div class="item" ng-show="!wallet.isPrivKeyExternal() && !wallet.canSign()">
<span translate></span>
<span class="item-note">
No private key
</span>
</div>
<div class="item" ng-show="index.account">
<div class="item" ng-show="wallet.credentials.account">
<span translate>Account</span>({{derivationStrategy}})
<span class="item-note">
#{{index.account}}
#{{wallet.credentials.account}}
</span>
</div>
@ -77,9 +71,9 @@
Copayers
</div>
<div class="item item-icon-right" ng-repeat="copayer in index.copayers">
<span ng-show="copayer.id == index.copayerId" translate>{{copayer.name}} ({{'Me'|translate}})</span>
<span ng-style="{'color': 'grey';}" ng-show="copayer.id != index.copayerId" translate>{{copayer.name}}</span>
<div class="item item-icon-right" ng-repeat="copayer in wallet.copayers">
<span ng-show="copayer.id == wallet.copayerId" translate>{{copayer.name}} ({{'Me'|translate}})</span>
<span ng-style="{'color': 'grey';}" ng-show="copayer.id != wallet.copayerId" translate>{{copayer.name}}</span>
<i class="icon ion-ios-checkmark-outline"></i>
</div>
@ -110,21 +104,18 @@
<div translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div>
<ul class="no-bullet m0">
<li ng-style="{'color':index.backgroundColor}" href ui-sref="walletHome" ng-click="index.retryScan()" translate>
<button class="button button-block" ng-style="{'color':wallet.color}" href ui-sref="walletHome" ng-click="index.retryScan()" translate>
Scan addresses for funds
</li>
<li ng-style="{'color':index.backgroundColor}" ng-show="index.isCordova" ng-click="sendAddrs()" translate>
</button>
<button class="button button-block" ng-style="{'color':wallet.color}" ng-show="isCordova" ng-click="sendAddrs()" translate>
Send addresses by email
</li>
</ul>
</div>
</button>
<div ng-show="index.balanceByAddress" ng-if="index.balanceByAddress[0]">
<div ng-show="wallet.balanceByAddress" ng-if="wallet.balanceByAddress[0]">
<div class="item item-divider">
Balance By Address
</div>
<div class="item" ng-repeat="a in index.balanceByAddress" ng-click="copyToClipboard(a.address)">
<div class="item" ng-repeat="a in wallet.balanceByAddress" ng-click="copyToClipboard(a.address)">
<span>{{a.address}}</span>
<span class="item-note">
{{(a.amount/1e8).toFixed(8)}} BTC