Merge branch 'staging'

bitshares · Mar 2, 2018 · 4ddc125 · 4ddc125
2 parents 85831d5 + 4c9ddbe
commit 4ddc125
Show file tree

Hide file tree

Showing 5 changed files with 341 additions and 148 deletions.
diff --git a/app/components/Blockchain/Operation.jsx b/app/components/Blockchain/Operation.jsx
@@ -77,13 +77,13 @@ class Row extends React.Component {
     }
 
     render() {
-        let {block, fee, color, type, hideOpLabel} = this.props;
+        let {block, fee, color, type, hideOpLabel, hidePending} = this.props;
 
         let last_irreversible_block_num = this.props.dynGlobalObject.get(
             "last_irreversible_block_num"
         );
         let pending = null;
-        if (block > last_irreversible_block_num) {
+        if (!hidePending && block > last_irreversible_block_num) {
             pending = (
                 <span>
                     (<Translate
@@ -1310,6 +1310,7 @@ class Operation extends React.Component {
                 hideDate={this.props.hideDate}
                 info={column}
                 hideFee={this.props.hideFee}
+                hidePending={this.props.hidePending}
             />
         ) : null;