Skip to content

Commit

Permalink
everything is working now
Browse files Browse the repository at this point in the history
  • Loading branch information
@kakysha
kakysha committed Dec 1, 2017
1 parent 8afa236 commit 6a61d44
Show file tree
Hide file tree
Showing 6 changed files with 1,684 additions and 1,543 deletions.
29 changes: 29 additions & 0 deletions public/views/modals/share.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<nav class="tab-bar">
<section class="left-small">
<a ng-click="cancel()" class="p10">
<span class="text-close" translate>Close</span>
</a>
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color':color}" translate>
Send payment using social media
</h1>
</section>
</nav>

<div class="modal-content fix-modals-touch">
<div ng-show="!amountInSmallestUnits" class="row m20t">
<div class="large-12 large-centered columns">
<div ng-if="address">
<button ng-if="isCordova" ng-click="shareToEmail()">{{buttonLabel}}</button>
<a href="mailto:{{address}}?body={{text | encodeURIComponent}}&subject={{subject | encodeURIComponent}}" ng-if="!isCordova">{{buttonLabel}}</a>
</div>
<div>
<textarea>
{{text}}
</textarea>
</div>
</div>
</div>

</div>
12 changes: 8 additions & 4 deletions public/views/modals/tx-details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ <h4 class="title m0" translate>Details</h4>
</span>
</li>

<li ng-if="btx.to" class="line-b p10 oh" ng-click="copyAddress(btx.to)">
<li ng-if="btx.textAddress" class="line-b p10 oh" ng-click="copyAddress(btx.textAddress)">
<span class="text-gray" translate>To email</span>:
<span class="right">
<contact class="enable_text_select" address="{{btx.to}}"></contact>
<contact class="enable_text_select" address="{{btx.textAddress}}"></contact>
</span>
</li>

Expand Down Expand Up @@ -119,20 +119,24 @@ <h4 class="title m0" translate>Details</h4>
</span>
</li>

<li ng-if="btx.to" class="line-b p10 oh">
<li ng-if="btx.textcoin" class="line-b p10 oh">
<span class="text-gray" translate>Was claimed</span>?
<span class="right" >
<span class="text-warning" ng-show="!btx.claimed" translate>
not claimed
</span>
(<a href="#" ng-click="$root.$emit('claimTextcoin', btx.mnemonic);cancel()" style="padding: 0; color: inherit;">claim back</a>)
<span ng-show="!btx.claimed">
(<a href="#" ng-click="$root.$emit('claimTextcoin', btx.mnemonic);cancel()" style="padding: 0; color: inherit;">claim back</a>)
</span>
<span class="label gray radius" ng-show="btx.claimed" translate>
claimed by {{btx.claimedByMe?'me':'receiver'|translate}}
</span>

</span>
</li>

<button ng-if="btx.textcoin" ng-click="shareAgain()">Share again</button>

<li ng-if="btx.action == 'sent' && isPrivate" class="line-b p10 oh">
If the recipient doesn't see your payment, you can <a class="blue-link" style="padding: 0" ng-click="showCorrespondentList()" translate>re-send private payloads</a>
</li>
Expand Down
91 changes: 51 additions & 40 deletions public/views/walletHome.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,45 +331,6 @@ <h4 class="title m0">
This is a private asset, please send it only by clicking links in the chat or send it to your other wallets.
</div>

<div ng-hide="home.hideAddress">
<div class="row collapse">
<label for="address" class="left" >
<span translate>To</span>
</label>
<span ng-hide="sendPaymentForm.address.$pristine">
<span class="has-error right size-12" ng-show="sendPaymentForm.address.$invalid && _address">
<i class="icon-close-circle size-14"></i>
<span class="vm" translate>Not valid</span>
</span>
<small class="right text-primary" ng-show="!sendPaymentForm.address.$invalid">
<i class="icon-checkmark-circle size-14"></i>
</small>
</span>
</div>

<div class="input">
<input class="m0" type="text" id="address" name="address" ng-disabled="home.blockUx || home.lockAddress || !home.canSendExternalPayment()" ng-attr-placeholder="{{home.canSendExternalPayment() ? 'Byteball address or email' : 'Byteball address of your other wallet &#8594;'}}" ng-model="_address" valid-address-or-email required ng-focus="home.formFocus('address')" ng-blur="home.formFocus(false)">
<!--<div class="addressbook-input" ng-show="!sendPaymentForm.address.$invalid && _address">
{{index.addressbook[_address] || _address}}
</div>-->
<a class="postfix size-12 m0 text-gray" ng-hide="home.blockUx || home.lockAddress" ng-click="openDestinationAddressModal(index.otherWallets, _address)">
<i class="icon-wallet size-18"></i>
</a>
</div>
<div ng-if="home.deviceAddressIsKnown()" style="font-size: 11px; font-weight: bold; margin-top: -1.5rem; margin-bottom: 1.5rem">
<a ng-click="home.openBindModal()">
<span ng-if="!home.binding" translate>Bind the payment to a condition</span>
<span ng-if="home.binding" translate>This payment is bound to a condition</span>
</a>
</div>
<div id="binding-drop" class="f-dropdown" data-dropdown-content style="padding: 10px;" translate>To bind the payment to a condition, please click the peer's address in chat</div>
<div ng-if="!home.deviceAddressIsKnown()" style="font-size: 11px; font-weight: bold; margin-top: -1.5rem; margin-bottom: 1.5rem">
<a dropdown-toggle="#binding-drop" data-options="align:top">
<span translate class="text-gray">Bind the payment to a condition</span>
</a>
</div>
</div>

<div class="row" ng-hide="home.hideAmount">
<div class="large-12 medium-12 columns">
<div class="right" ng-hide="sendPaymentForm.amount.$pristine && !sendPaymentForm.amount.$modelValue ">
Expand All @@ -396,7 +357,52 @@ <h4 class="title m0">
</div>
</div>
</div>
<div class="row" ng-show="index.bHasMerkle">

<div class="mtabset">
<div class="mtab-title active" ng-click="mtab = 1" ng-class="{'active': mtab == 1}" ng-style="{'color': noColor ? '#4A90E2' : index.backgroundColor}" translate="" style="color: rgb(250, 167, 127);">To byteball address</div>
<div class="mtab-title" ng-click="mtab = 2" ng-class="{'active': mtab == 2}" ng-style="{'color': noColor ? '#4A90E2' : index.backgroundColor}" donttranslate="" style="color: rgb(250, 167, 127);">Share to social media</div>
</div>
<div class="mtab" ng-class="{'active': mtab == 1}" ng-init="mtab = 1">
<div ng-hide="home.hideAddress">
<div class="row collapse">
<label for="address" class="left" >
<span translate>To byteball address</span>
</label>
<span ng-hide="sendPaymentForm.address.$pristine">
<span class="has-error right size-12" ng-show="sendPaymentForm.address.$invalid && _address">
<i class="icon-close-circle size-14"></i>
<span class="vm" translate>Not valid</span>
</span>
<small class="right text-primary" ng-show="!sendPaymentForm.address.$invalid">
<i class="icon-checkmark-circle size-14"></i>
</small>
</span>
</div>

<div class="input">
<input class="m0" type="text" id="address" name="address" ng-disabled="home.blockUx || home.lockAddress || !home.canSendExternalPayment()" ng-attr-placeholder="{{home.canSendExternalPayment() ? 'Byteball address or email' : 'Byteball address of your other wallet &#8594;'}}" ng-model="_address" ng-required valid-address-or-email ng-focus="home.formFocus('address')" ng-blur="home.formFocus(false)">
<!--<div class="addressbook-input" ng-show="!sendPaymentForm.address.$invalid && _address">
{{index.addressbook[_address] || _address}}
</div>-->
<a class="postfix size-12 m0 text-gray" ng-hide="home.blockUx || home.lockAddress" ng-click="openDestinationAddressModal(index.otherWallets, _address)">
<i class="icon-wallet size-18"></i>
</a>
</div>
<div ng-if="home.deviceAddressIsKnown()" style="font-size: 11px; font-weight: bold; margin-top: -1.5rem; margin-bottom: 1.5rem">
<a ng-click="home.openBindModal()">
<span ng-if="!home.binding" translate>Bind the payment to a condition</span>
<span ng-if="home.binding" translate>This payment is bound to a condition</span>
</a>
</div>
<div id="binding-drop" class="f-dropdown" data-dropdown-content style="padding: 10px;" translate>To bind the payment to a condition, please click the peer's address in chat</div>
<div ng-if="!home.deviceAddressIsKnown()" style="font-size: 11px; font-weight: bold; margin-top: -1.5rem; margin-bottom: 1.5rem">
<a dropdown-toggle="#binding-drop" data-options="align:top">
<span translate class="text-gray">Bind the payment to a condition</span>
</a>
</div>
</div>

<div class="row" ng-show="index.bHasMerkle">
<div class="large-12 columns">
<label for="merkle_proof"><span translate>Merkle proof</span>
<small translate ng-hide="!sendPaymentForm.merkle_proof.$pristine">optional</small>
Expand Down Expand Up @@ -442,6 +448,11 @@ <h4 class="title m0">
</div>

</div>
</div>

<div class="mtab" ng-class="{'active': mtab == 2}">
<button type="submit" ng-disabled="home.current_payment_key || home.blockUx || index.isOffline || !index.isEnoughSignersSelected() || sendPaymentForm.amount.$invalid" translate>Share to social media</button>
</div>
</form>
</div>
</div>
Expand Down
Loading

0 comments on commit 6a61d44

Please sign in to comment.