fix txps modal
This commit is contained in:
Gustavo Maximiliano Cortez
parent
5263f34991
commit
df03fc9112
3 changed files with 80 additions and 92 deletions
|
|
@ -799,7 +799,7 @@ input[type=number]::-webkit-outer-spin-button {
|
|||
background-color: #A02F23;
|
||||
}
|
||||
|
||||
.txp-popup .header {
|
||||
.header-modal {
|
||||
background: #F3F5F6;
|
||||
width: 100%;
|
||||
padding: 0.8rem;
|
||||
|
|
|
|||
|
|
@ -294,14 +294,5 @@
|
|||
padding: 15px;
|
||||
}
|
||||
|
||||
.button-popup {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
background-color: #F3F5F6;
|
||||
padding: 1rem 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,101 +1,98 @@
|
|||
<div class="txp-popup">
|
||||
<div class="header">
|
||||
<div ng-repeat="out in tx.outs">
|
||||
<div class="ellipsis p10b size-16 m20r">
|
||||
<span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span>
|
||||
<span class="text-gray">
|
||||
To:
|
||||
<span ng-if="tx.merchant">
|
||||
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
|
||||
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
|
||||
</span>
|
||||
<contact address="{{out.address}}" ng-hide="tx.merchant"></contact>
|
||||
<div class="header-modal">
|
||||
<div ng-repeat="out in tx.outs">
|
||||
<div class="ellipsis p10b size-16 m20r">
|
||||
<span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span>
|
||||
<span class="text-gray">
|
||||
To:
|
||||
<span ng-if="tx.merchant">
|
||||
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
|
||||
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
|
||||
</span>
|
||||
<contact address="{{out.address}}" ng-hide="tx.merchant"></contact>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="p25l" ng-class="{'text-gray':!pendingForUs}">
|
||||
<div class="size-21 text-bold m5b">
|
||||
{{out.value}} {{$root.wallet.settings.unitName}}
|
||||
</div>
|
||||
|
||||
<div class="p25l" ng-class="{'text-gray':!pendingForUs}">
|
||||
<div class="size-21 text-bold m5b">
|
||||
{{out.value}} {{$root.wallet.settings.unitName}}
|
||||
</div>
|
||||
<span class="alt-currency black size-12" ng-class="{'gray':!pendingForUs}">
|
||||
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
|
||||
</div>
|
||||
|
||||
<div class="m10v line-b size-14" ng-show="tx.comment">
|
||||
<div class="oh" ng-if="tx.ts || tx.createdTs ">
|
||||
<p class="left m5b">{{$root.iden.getName()}}</p>
|
||||
<div class="text-gray text-right m5t size-12">
|
||||
<time>{{ (tx.ts || tx.createdTs ) | amTimeAgo}}</time>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-gray m10b">
|
||||
{{tx.comment}}
|
||||
<span class="alt-currency black size-12" ng-class="{'gray':!pendingForUs}">
|
||||
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
|
||||
</div>
|
||||
|
||||
<div class="m10v line-b size-14" ng-if="tx.merchant">
|
||||
<div class="oh">
|
||||
<p class="left m5b">Merchant Message:</p>
|
||||
<div class="text-gray text-right m5t size-12" ng-if="tx.merchant && tx.merchant.expirationDate">
|
||||
<span><i>Expires</i>: {{tx.merchant.expirationDate | amTimeAgo }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-gray m10b">
|
||||
{{tx.merchant.pr.pd.memo}}
|
||||
<div class="m10v line-b size-14" ng-show="tx.comment">
|
||||
<div class="oh" ng-if="tx.ts || tx.createdTs ">
|
||||
<p class="left m5b">{{$root.iden.getName()}}</p>
|
||||
<div class="text-gray text-right m5t size-12">
|
||||
<time>{{ (tx.ts || tx.createdTs ) | amTimeAgo}}</time>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="tx.actionList[0]" class="m10v">
|
||||
<i>Signatures:</i>
|
||||
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
|
||||
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
||||
<span>
|
||||
<i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i>
|
||||
<i ng-if="c.actions.sign" class="fi-check icon-sign check"></i>
|
||||
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="m10r fi-loop icon-rotate"></i>
|
||||
</span>
|
||||
<span>
|
||||
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active m10r"></i>
|
||||
</span>
|
||||
<span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error}}
|
||||
</span>
|
||||
<a class="close-notification text-warning" ng-click="error=null">×</a>
|
||||
</div>
|
||||
|
||||
<div class="row button-popup"
|
||||
ng-init="hideSign = false; hideReject = false"
|
||||
ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="button warning m0 expand" ng-click="hideSign = true; reject(tx.ntxid);"
|
||||
ng-disabled="loading" ng-show="!hideReject">
|
||||
<i class="fi-x icon-sign x" ng-show="!loading"></i>
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
|
||||
<span translate>Reject</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button class="button primary m0 expand" ng-click="hideReject = true; sign(tx.ntxid)"
|
||||
ng-disabled="loading" ng-show="!hideSign">
|
||||
<i class="fi-check icon-sign check" ng-show="!loading"></i>
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
|
||||
<span translate>Sign</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="text-gray m10b">
|
||||
{{tx.comment}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="m10v line-b size-14" ng-if="tx.merchant">
|
||||
<div class="oh">
|
||||
<p class="left m5b">Merchant Message:</p>
|
||||
<div class="text-gray text-right m5t size-12" ng-if="tx.merchant && tx.merchant.expirationDate">
|
||||
<span><i>Expires</i>: {{tx.merchant.expirationDate | amTimeAgo }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-gray m10b">
|
||||
{{tx.merchant.pr.pd.memo}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="tx.actionList[0]" class="m10v">
|
||||
<i>Signatures:</i>
|
||||
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
|
||||
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
|
||||
<span>
|
||||
<i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i>
|
||||
<i ng-if="c.actions.sign" class="fi-check icon-sign check"></i>
|
||||
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="m10r fi-loop icon-rotate"></i>
|
||||
</span>
|
||||
<span>
|
||||
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active m10r"></i>
|
||||
</span>
|
||||
<span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="box-notification" ng-show="error">
|
||||
<div class="box-icon error">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
<span class="text-warning size-14">
|
||||
{{error}}
|
||||
</span>
|
||||
<a class="close-notification text-warning" ng-click="error=null">×</a>
|
||||
</div>
|
||||
|
||||
<div class="row"
|
||||
ng-init="hideSign = false; hideReject = false"
|
||||
ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
|
||||
<div class="large-6 medium-6 small-6 columns">
|
||||
<button class="button warning m0 expand" ng-click="hideSign = true; reject(tx.ntxid);"
|
||||
ng-disabled="loading" ng-show="!hideReject">
|
||||
<i class="fi-x icon-sign x" ng-show="!loading"></i>
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
|
||||
<span translate>Reject</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-6 columns text-right">
|
||||
<button class="button primary m0 expand" ng-click="hideReject = true; sign(tx.ntxid)"
|
||||
ng-disabled="loading" ng-show="!hideSign">
|
||||
<i class="fi-check icon-sign check" ng-show="!loading"></i>
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i>
|
||||
<span translate>Sign</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue