diff --git a/www/templates/wot/view_identity_tx.html b/www/templates/wot/view_identity_tx.html index 2747ebeab02d5e1c8723d836c12225efe55856f7..e68d325524fbf55a34fee455298878b3ff1fdcd6 100644 --- a/www/templates/wot/view_identity_tx.html +++ b/www/templates/wot/view_identity_tx.html @@ -1,9 +1,11 @@ <ion-view left-buttons="leftButtons"> <ion-nav-title> - <span class="visible-xs visible-sm">{{::formData.name||formData.uid}}</span> + <span class="visible-xs visible-sm">{{::formData.name||formData.uid||(formData.pubkey|formatPubkey)}}</span> <span class="hidden-xs hidden-sm" - ng-if="!loading" - translate="WOT.OPERATIONS.TITLE" translate-values="{uid: formData.name || formData.uid}"></span> + ng-if="!loading"> + <ng-if ng-if="formData.name || formData.uid">{{'WOT.OPERATIONS.TITLE'|translate: {uid: formData.name || formData.uid} }}</ng-if> + <ng-if ng-if="!formData.name && !formData.uid"><i class="ion-key"></i> {{formData.pubkey|formatPubkey}} {{'WOT.OPERATIONS.TITLE'|translate}}</ng-if> + </span> </ion-nav-title> <ion-content scroll="true"> @@ -42,7 +44,7 @@ <!-- the balance --> <div class="item item-tx item-divider"> - {{'ACCOUNT.BALANCE_ACCOUNT'|translate}} + {{:locale:'ACCOUNT.BALANCE_ACCOUNT'|translate}} <div class="badge item-note" ng-class=":balance:{'badge-assertive': formData.balance <= 0, 'badge-balanced': formData.balance > 0 }" ng-bind-html=":balance:formData.balance|formatAmount:{currency: $root.currency.name}"> @@ -63,6 +65,7 @@ <!-- Pending transactions --> <span class="item item-pending item-divider" ng-if="formData.tx.pendings && formData.tx.pendings.length"> + <i class="ion-clock"></i> {{:locale:'ACCOUNT.PENDING_TX'|translate}} </span> diff --git a/www/templates/wot/view_identity_tx_error.html b/www/templates/wot/view_identity_tx_error.html deleted file mode 100644 index 5284be9b21aa208e4a60b931c5c3f9c1662a0ed2..0000000000000000000000000000000000000000 --- a/www/templates/wot/view_identity_tx_error.html +++ /dev/null @@ -1,86 +0,0 @@ -<ion-view left-buttons="leftButtons" - class="view-wallet-tx-error"> - <ion-nav-title> - <!-- no title--> - </ion-nav-title> - - <ion-nav-buttons side="secondary"> - <cs-extension-point name="nav-buttons"></cs-extension-point> - </ion-nav-buttons> - - <ion-content scroll="true" - class="refresher-top-bg" - bind-notifier="{ rebind:settings.useRelative, locale:settings.locale.id}"> - - <ion-refresher pulling-text="{{'COMMON.BTN_REFRESH' | translate}}" - on-refresh="doUpdate(true)"> - </ion-refresher> - - <!-- Buttons bar --> - <div class="hidden-xs hidden-sm padding text-center"> - - <button class="button button-stable button-small-padding icon ion-loop ink" - ng-click="doUpdate()" - title="{{'COMMON.BTN_REFRESH' | translate}}"> - </button> - </div> - - <div class="row no-padding"> - <div class="col col-20 hidden-xs hidden-sm"> - </div> - - <div class="col list" ng-class="::motion.ionListClass"> - - <!-- Pending received TX --> - <span class="item item-divider"> - <span translate>ACCOUNT.PENDING_TX_RECEIVED</span> - <div class="badge item-note"> - <span ng-if="!$root.settings.useRelative">({{$root.currency.name | abbreviate}})</span> - <span ng-if="$root.settings.useRelative">({{'COMMON.UD' | translate}}<sub>{{$root.currency.name | abbreviate}}</sub>)</span> - </div> - </span> - - <span class="item padding" ng-if="!loading && !hasReceivedTx()"> - <span class="gray">{{:locale:'ACCOUNT.NO_TX'|translate}}</span> - </span> - - - <div class="item item-pending item-tx item-icon-left" - ng-repeat="tx in formData.tx.errors | filter: filterReceivedTx" - ng-init="pending=true;" - ng-include="'templates/wallet/item_tx.html'"> - </div> - - <!-- Error sent TX --> - <span class="item item-divider"> - <span translate>ACCOUNT.ERROR_TX_SENT</span> - <div class="badge item-note"> - <span ng-if="!$root.settings.useRelative">({{$root.currency.name | abbreviate}})</span> - <span ng-if="$root.settings.useRelative">({{'COMMON.UD' | translate}}<sub>{{$root.currency.name | abbreviate}}</sub>)</span> - </div> - </span> - - <span class="item padding" ng-if="!loading && !hasSentTx()"> - <span class="gray">{{:locale:'ACCOUNT.NO_TX'|translate}}</span> - </span> - - <div class="item item-pending item-tx item-icon-left" - ng-repeat="tx in formData.tx.errors | filter: filterSentTx" - ng-init="error=true;" - ng-include="'templates/wallet/item_tx.html'"> - </div> - - </div> - - <div class="col col-20 hidden-xs hidden-sm"> - </div> - </div> - </ion-content> - - <!--button id="fab-redo-transfer" - ng-if="walletData" - class="button button-fab button-fab-bottom-right button-energized-900 hidden-md hidden-lg drop" - ng-click="redoTransfer()"> - <i class="icon ion-refresh"></i> - </button--> -</ion-view>