Merge branch 'staging'

bitshares · Mar 2, 2018 · ab2f891 · ab2f891
2 parents 4ddc125 + f96b124
commit ab2f891
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/components/Modal/BorrowModal.jsx b/app/components/Modal/BorrowModal.jsx
@@ -343,10 +343,14 @@ class BorrowModalContent extends React.Component {
                     a.getIn(["call_price", "quote", "asset_id"]) ===
                     props.quote_asset.get("id")
                 );
-            }) || {
-                collateral: null,
-                debt: null
-            };
+            });
+
+            currentPosition = !!currentPosition
+                ? currentPosition.toJS()
+                : {
+                      collateral: null,
+                      debt: null
+                  };
         }
         return currentPosition;
     }