fix(Transaction): don't show historical value for non-USD and very re…

…cent transactions
blockchain · Jun 14, 2016 · b9ea62c · b9ea62c
1 parent 993a49a
commit b9ea62c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/templates/transaction-description.jade b/app/templates/transaction-description.jade
@@ -28,7 +28,7 @@
     .flex-1.hidden-sm.hidden-xs.pointer(ng-click="tx.toggled = !tx.toggled")
       div
     .flex-2.flex-column.flex-align-end.mtvl
-      .flex-row
+      .flex-row(ng-show="settings.currency.code === 'USD' && tx.confirmations > 5")
         p.mbn(translate="VALUE_AT_SEND" ng-show=":: tx.txType === 'sent' || tx.txType === 'transfer'")
         p.mbn(translate="VALUE_WHEN_RECEIVED" ng-show=":: tx.txType === 'received'")
         | :&nbsp;

diff --git a/assets/js/directives/transaction-description.directive.js b/assets/js/directives/transaction-description.directive.js
@@ -35,6 +35,8 @@ function transactionDescription ($translate, Wallet) {
               (tx.txType === 'sent' && tx.fromWatchOnly);
     };
 
+    scope.settings = Wallet.settings;
+
     scope.txDirection = scope.getTxDirection(scope.tx.txType);
     scope.txClass = scope.getTxClass(scope.tx.txType);
     scope.txWatchOnly = scope.getTxWatchOnly(scope.tx);