Translations additions + some (s)css + review transaction changes

This commit is contained in:
Sebastiaan Pasma 2018-08-02 16:05:12 +02:00
commit f49e8725e8
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
6 changed files with 34 additions and 20 deletions

View file

@ -12,7 +12,7 @@
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
<div class="header" ng-class="vm.thirdParty.id">
<div class="content">
<p translate>You are sending</p>
<p>{{vm.sendingTitle}}</p>
<p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</amount></p>
<p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
</div>
@ -84,13 +84,13 @@
<click-to-accept
ng-click="approve(tx, wallet, statusChangeHandler)"
ng-if="(!isCordova || isWindowsPhoneApp) && wallet"
ng-if="(!isCordova || isWindowsPhoneApp)"
click-send-status="sendStatus"
is-disabled="!wallet">
{{buttonText}}
</click-to-accept>
<slide-to-accept
ng-if="isCordova && !isWindowsPhoneApp && wallet"
ng-if="isCordova && !isWindowsPhoneApp"
slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
slide-send-status="sendStatus"
is-disabled="!wallet">
@ -104,14 +104,4 @@
<span ng-show="wallet.m > 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Proposal Created</span>
<span ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" translate>Transaction Created</span>
</slide-to-accept-success>
<wallet-selector
wallet-selector-title="walletSelectorTitle"
wallet-selector-wallets="wallets"
wallet-selector-selected-wallet="wallet"
wallet-selector-show="walletSelector"
wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector>
</ion-view>

View file

@ -13,12 +13,11 @@
<img class="swap-image" src="img/shapeshift_swap.png"/>
</div>
<div class="subtitle">
<p translate>Exchange your BTC to BCH in minutes.</p>
<div ng-show="!walletsWithFunds.length">
<p translate>Before exchanging your BTC to BCH, you will need to add funds to your wallet.</p>
<p translate>You can receive Bitcoin from any wallet or service.</p>
<p translate>To start the process you need to add funds to your wallet.</p>
</div>
<div ng-show="walletsWithFunds.length">
<p translate>Using Shapeshift will allow you to exchange your BTC for BCH.</p>
<p translate>The process is fast and you will receive the exchanged amount in your wallet.</p>
</div>
<div ng-show="!hasWallets" translate>To get started, you'll need to create a bitcoin wallet and get some bitcoin.</div>