Merge pull request #1902 from OpenBazaar/brian.fixmoderators

Brian.fixmoderators

Author: hoffmabc

js/utils/currency.js

@@ -977,6 +977,20 @@ export function validateCurrencyAmount(amount, divisibility, options = {}) {
   returnVal.validRequired = true;
 
   const bigNum = bigNumber(amount);
+  console.log(amount);
+
+  if (
+    (
+      opts.requireBigNumAmount &&
+      !(amount instanceof bigNumber)
+    ) ||
+    (bigNum.isNaN())
+  ) {
+    returnVal.validType = false;
+    return returnVal;
+  }
+
+  returnVal.validType = true;
 
   switch (opts.rangeType) {
     case CUR_VAL_RANGE_TYPES.GREATER_THAN_ZERO:

js/views/components/moderators/Moderators.js

@@ -11,6 +11,7 @@ import baseVw from '../../baseVw';
 import { openSimpleMessage } from '../../modals/SimpleMessage';
 import ModCard from './Card';
 import ModeratorsStatus from './Status';
+import bigNumber from "bignumber.js";
 
 export default class extends baseVw {
   /**
@@ -153,6 +154,11 @@ export default class extends baseVw {
     const modCurs = data.moderatorInfo && data.moderatorInfo.acceptedCurrencies || [];
     const supportedCur = anySupportedByWallet(modCurs);
 
+    if(data.moderatorInfo.fee.feeType == "FIXED_PLUS_PERCENTAGE" &&
+      !(data.moderatorInfo.fee.fixedFee.amount instanceof bigNumber) ) {
+      data.moderatorInfo.fee.fixedFee.amount = bigNumber(data.moderatorInfo.fee.fixedFee.amount);
+    }
+
     if ((!!isAMod && supportedCur || this.options.showInvalid)) {
       const newMod = new Moderator(data, { parse: true });
       if (newMod.isValid()) this.moderatorsCol.add(newMod);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openbazaar-desktop",
   "productName": "OpenBazaar Desktop Client",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "serverVersionRequired": "0.14.3",
   "description": "Decentralized p2p marketplace that uses Cryptocurrencies.",
   "main": "bootstrapper.js",