From 351b52b5051f78b013d56abb1833db8d0c23b1b7 Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Mon, 27 Sep 2021 16:41:28 +0330 Subject: [PATCH 1/2] Fix get exchange rate for native currencies related to Giveth/giveth-next#2543 --- src/utils/tokenHelper.js | 6 ++++++ src/utils/tokenHelper.test.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/utils/tokenHelper.js b/src/utils/tokenHelper.js index 0c5ff931..ae25fa02 100644 --- a/src/utils/tokenHelper.js +++ b/src/utils/tokenHelper.js @@ -55,6 +55,12 @@ const getValidSymbols = () => { validSymbols.push(token.rateEqSymbol); } }); + config.nativeCurrencyWhitelist.forEach(currency => { + if (!validSymbols.includes(currency.symbol)) { + validSymbols.push(currency.symbol); + } + }); + return validSymbols; }; diff --git a/src/utils/tokenHelper.test.js b/src/utils/tokenHelper.test.js index b4862637..f56700fd 100644 --- a/src/utils/tokenHelper.test.js +++ b/src/utils/tokenHelper.test.js @@ -61,6 +61,12 @@ function isSymbolInTokenWhitelistTestCases() { it('should return false for NODE token', () => { assert.isFalse(isSymbolInTokenWhitelist('NODE')); }); + it('should return true for EUR token', () => { + assert.isTrue(isSymbolInTokenWhitelist('EUR')); + }); + it('should return true for THB token', () => { + assert.isTrue(isSymbolInTokenWhitelist('THB')); + }); } describe('test getTokenBySymbol() function', getTokenBySymbolTestCases); From 23103c45f8e0789ff46b9fb2560be6d808bf015c Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Mon, 27 Sep 2021 16:59:51 +0330 Subject: [PATCH 2/2] Fix test case of getValidSymbols() --- src/utils/tokenHelper.test.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/utils/tokenHelper.test.js b/src/utils/tokenHelper.test.js index f56700fd..8af5cd89 100644 --- a/src/utils/tokenHelper.test.js +++ b/src/utils/tokenHelper.test.js @@ -29,8 +29,9 @@ function getWhiteListTokensTestCases() { expect(getWhiteListTokens()).to.be.deep.equal(tokens); }); } + function getValidSymbolsTestCases() { - it('should return correct whiteList tokens', () => { + it('should return correct validSymbols tokens', () => { assert.sameDeepMembers(getValidSymbols(), [ 'ETH', 'SAI', @@ -42,6 +43,15 @@ function getValidSymbolsTestCases() { 'ANT', 'XDAI', 'USD', + 'EUR', + 'CAD', + 'GBP', + 'AUD', + 'BRL', + 'CHF', + 'CZK', + 'MXN', + 'THB', ]); // expect().to.be.deep.equal();