Merge pull request #32 from cmgustavo/ref/design-12

Removes msg error by popupService
This commit is contained in:
Matias Alejo Garcia 2016-09-01 15:44:56 -03:00 committed by GitHub
commit fd8f76bab0
21 changed files with 77 additions and 206 deletions

View file

@ -11,10 +11,6 @@
<ion-content ng-controller="joinController as join">
<div class="padding assertive" ng-show="join.error">
{{join.error|translate}}
</div>
<form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
<div class="card list">

View file

@ -25,9 +25,6 @@
</li>
<li class="item">
<div class="assertive" ng-show="error">
<span class="text-warning size-14">{{error|translate}}</span>
</div>
<div class="row" ng-if="tx.removed">
<div class="column m20t text-center text-warning size-12" translate>

View file

@ -10,10 +10,6 @@
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
<div class="padding assertive" ng-show="create.error">
{{create.error|translate}}
</div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="card list">

View file

@ -10,10 +10,6 @@
<ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)">
<div class="padding assertive" ng-show="create.error">
{{create.error|translate}}
</div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="card list">

View file

@ -10,10 +10,6 @@
<ion-content ng-controller="importController" ng-init="type='file'">
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<form name="importForm" ng-submit="importBlob(importForm)" novalidate>
<div class="list card">

View file

@ -10,10 +10,6 @@
<ion-content ng-controller="importController" ng-init="type='hwWallet'">
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<form name="importForm3" ng-submit="importHW(importForm3)" novalidate>
<div class="card" ng-show="!seedOptions[0]">

View file

@ -10,21 +10,15 @@
<ion-content ng-controller="importController" ng-init="type='12'">
<div ng-show="importErr || error" class="padding assertive" ng-click="importErr = error = null">
<div ng-show="importErr">
<div translate>Could not access the wallet at the server. Please check:</div>
<ul>
<li translate>The password of the recovery phrase (if set)</li>
<li translate>The derivation path</li>
<li translate>The wallet service URL</li>
</ul>
<div translate>
NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
</div>
</div>
<div ng-show="error">
{{error|translate}}
<div ng-show="importErr" class="padding assertive" ng-click="importErr = null">
<div translate>Could not access the wallet at the server. Please check:</div>
<ul>
<li translate>The password of the recovery phrase (if set)</li>
<li translate>The derivation path</li>
<li translate>The wallet service URL</li>
</ul>
<div translate>
NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the Recovery Phrase there.
</div>
</div>

View file

@ -11,10 +11,6 @@
</div>
</div>
<div class="padding assertive" ng-show="error">
{{error|translate}}
</div>
<div class="list card padding text-center" ng-if="!wallets[0]">
<span translate>No Wallet</span>
</div>