Merge pull request #1 from ripplefox/master

catch up

Author: xagfans

directive/tx-payment.html

@@ -6,14 +6,14 @@
 		<div class="transaction">
 				<span ng-show="tx.transaction.type == 'sent'">
 					{{'you_sent' | translate}}
-					<strong>{{tx.transaction.amount | rpamount}} {{tx.transaction.amount | rpcurrency:native.code}}</strong>
+					<strong>{{tx.transaction.amountSent | rpamount}} {{tx.transaction.amountSent | rpcurrency:native.code}}</strong>
 					{{'you_sent_to' | translate}}
 					<strong>{{tx.transaction.counterparty}}</strong>
 				</span>
 				<span ng-show="tx.transaction.type == 'received'">
 					<strong>{{tx.transaction.counterparty}}</strong>
 					{{'sent_you' | translate}}
-					<strong>{{tx.transaction.amount | rpamount}} {{tx.transaction.amount | rpcurrency:native.code}}</strong>
+					<strong>{{tx.transaction.amountSent | rpamount}} {{tx.transaction.amountSent | rpcurrency:native.code}}</strong>
 				</span>
 				<span ng-show="tx.tag">{{'tx_tag' | translate}} <strong>{{tx.tag}}</strong>)</span>
 

js/ripple/jsonrewriter.js

@@ -158,9 +158,10 @@ var JsonRewriter = module.exports = {
     var amtSent;
 
     if (tx.TransactionType === "Payment") {
-      if (meta.DeliveredAmount) {
-        return meta.DeliveredAmount;
+      if (meta.delivered_amount) {
+        return meta.delivered_amount;
       }
+      console.warn("****************");
 
       if (meta.AffectedNodes) {
         // Find the metadata node with entry type == "RippleState"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "FoxletRipple",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "RippleFox Client",
   "main": "main.js",
   "scripts": {