Skip to content

Commit

Permalink
Merge pull request #1109 from achamely/master
Browse files Browse the repository at this point in the history
QR generation
  • Loading branch information
achamely committed Dec 3, 2014
2 parents c871f42 + 0ae365d commit 213b5fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions www/js/WalletAddressesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ angular.module('omniwallet')
}
balances[currencyItem.symbol].addresses[addr.address] = {
"address": addr.address,
"qr": "https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl="+addr.address+"&choe=UTF-8",
"balance": +value || currencyItem.value,
"value": appraiser.getValue(currencyItem.value, currencyItem.symbol, currencyItem.divisible),
"private": hasPrivate,
Expand Down
6 changes: 3 additions & 3 deletions www/partials/wallet_address_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ <h3>Invalid Addresses in Your Wallet</h3>
</thead>
<tbody>
<tr ng-repeat="item in currency.addresses">
<td ng-show="{{item.offline}}">{{item.address}} <a href="/about/faq" target="_new"><span class="glyphicon glyphicon-off" tooltip="This is an Armory Offline address. (Click for more info)"></span></a></td>
<td ng-show="{{item.private}}">{{item.address}} <a href="/about/faq" target="_new"><span class="glyphicon glyphicon-lock" tooltip="Your Wallet has the Private key for this address. (Click for more info)"></span></a></td>
<td ng-hide="{{item.private}} || {{item.offline}}">{{item.address}}</td>
<td ng-show="{{item.offline}}"><img ng-src="{{item.qr}}" ng-show="showqr"><a href ng-click="showqr = !showqr">{{item.address}}</a> <a href="/about/faq" target="_new"><span class="glyphicon glyphicon-off" tooltip="This is an Armory Offline address. (Click for more info)"></span></a></td>
<td ng-show="{{item.private}}"><img ng-src="{{item.qr}}" ng-show="showqr"><a href ng-click="showqr = !showqr">{{item.address}}</a> <a href="/about/faq" target="_new"><span class="glyphicon glyphicon-lock" tooltip="Your Wallet has the Private key for this address. (Click for more info)"></span></a></td>
<td ng-hide="{{item.private}} || {{item.offline}}"><img ng-src="{{item.qr}}" ng-show="showqr"><a href ng-click="showqr = !showqr">{{item.address}}</a></td>
<td ng-if="currency.property_type != undefined && currency.property_type == 1" class="currency number" title="{{item.balance}}" ng-bind-html="item.balance | numeraljs: '0,0'"></td>
<td ng-if="currency.property_type != undefined && currency.property_type == 2" class="currency number" title="{{item.balance}}" ng-bind-html="item.balance | numeraljs: '0,0.00000000'"></td>
<td ng-if="currency.property_type == undefined" class="currency number" title="{{item.balance}}"><span ng-bind-html="item.balance | numeraljs: '0,0.00000000'"></span> {{currency.symbol}}</td>
Expand Down

0 comments on commit 213b5fe

Please sign in to comment.