Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Show the label of the account on the menu and the sending ARK dialog #504

Merged
merged 1 commit into from Jan 6, 2018
Merged

Show the label of the account on the menu and the sending ARK dialog #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions client/app/src/components/account/account-card.controller.js
View file
Open in desktop
Expand Up @@ -121,9 +121,10 @@
}

$scope.bs = {
label: selectedAccount.username,
address: selectedAccount.address,
answer: answer,
items: items
answer,
items
}

$mdBottomSheet.show({
Expand Down Expand Up @@ -162,6 +163,7 @@
let data = {
ledger: selectedAccount.ledger,
fromAddress: selectedAccount ? selectedAccount.address : '',
fromLabel: selectedAccount ? selectedAccount.username : null,
secondSignature: selectedAccount ? selectedAccount.secondSignature : '',
passphrase: passphrases[0] ? passphrases[0] : '',
secondpassphrase: passphrases[1] ? passphrases[1] : ''
Expand Down
3 changes: 2 additions & 1 deletion client/app/src/components/account/templates/account-menu.html
View file
Open in desktop
@@ -1,6 +1,7 @@
<md-bottom-sheet class="md-grid" layout="column">
<div layout="row" layout-align="center center" ng-cloak>
<h2>{{bs.address}}</h2>
<h2 ng-if="bs.label">{{bs.label}} ({{bs.address}})</h2>
<h2 ng-if="! bs.label">{{bs.address}}</h2>
</div>
<div ng-cloak>
<md-list flex layout="row" layout-align="center center">
Expand Down
3 changes: 2 additions & 1 deletion client/app/src/components/account/templates/send-transaction-dialog.html
View file
Open in desktop
Expand Up @@ -2,7 +2,8 @@
<form name="sendArkForm" ng-submit="send.submit()">
<md-toolbar>
<div class="md-toolbar-tools">
<h2><span>{{'Send'|translate}} {{ac.network.token}} {{'from'|translate}}</span>&nbsp;{{send.data.fromAddress}}</h2>
<h2 ng-if="send.data.fromLabel"><span>{{'Send'|translate}} {{ac.network.token}} {{'from'|translate}}</span>&nbsp;{{send.data.fromLabel}} ({{send.data.fromAddress}})</h2>
<h2 ng-if="! send.data.fromLabel"><span>{{'Send'|translate}} {{ac.network.token}} {{'from'|translate}}</span>&nbsp;{{send.data.fromAddress}}</h2>
<span flex></span>
<md-button class="md-icon-button" ng-click="send.cancel()">
<md-icon md-font-library="material-icons">clear</md-icon>
Expand Down