From 1a63514d9bd8dfdadd8e1a37d0173dfb8359f5f9 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Mon, 6 Jul 2020 21:54:22 -0400 Subject: [PATCH 1/2] Fix tests --- js/utils/currency.js | 14 ++++++++++++++ js/views/components/moderators/Moderators.js | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/js/utils/currency.js b/js/utils/currency.js index f00aa7671..c24ddc5b8 100644 --- a/js/utils/currency.js +++ b/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: diff --git a/js/views/components/moderators/Moderators.js b/js/views/components/moderators/Moderators.js index 006d2232f..7e5b3c982 100644 --- a/js/views/components/moderators/Moderators.js +++ b/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); From a4765e8130681b4859109fb9822a5f4fa48a83fa Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Mon, 6 Jul 2020 21:54:39 -0400 Subject: [PATCH 2/2] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 555aace7e..9f94b45af 100644 --- a/package.json +++ b/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",