DIG-27962 viser korrekt valuta for kontoer med andre valutaer enn NOK

SpareBank1 · Oct 25, 2017 · ed7f411 · ed7f411
1 parent 99a6471
commit ed7f411
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog
+# v.7.10.0
+* Show correct currency for accounts with currencyCodes other than NOK.
 
 # v7.9.2
 * Fixed issue where iOS9 units may not receive click event

diff --git a/examples/account-selector.js b/examples/account-selector.js
@@ -65,6 +65,7 @@ class AccountSelectorExample extends Component {
           locale='nb'
           id='account-selector'
           suggestionsHeightMax={500}
+          showBalance={true}
         />
       </div>
     );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffe-account-selector-react",
-  "version": "7.9.2",
+  "version": "7.10.0",
   "main": "lib/index.js",
   "scripts": {
     "build": "babel -d lib/. --ignore=*.test.js src/.",

diff --git a/src/account/account-details.js b/src/account/account-details.js
@@ -4,7 +4,7 @@ import {accountFormatter, balanceWithCurrency} from '../util/format';
 import {Account, Locale} from '../util/types';
 
 function AccountDetails({account, locale, showBalance = true}) {
-  const {balance, accountNumber} = account;
+  const {balance, accountNumber, currencyCode} = account;
   const hasBalance = balance != null;
   return (
     <div className='ffe-account-selector__details'>
@@ -13,7 +13,7 @@ function AccountDetails({account, locale, showBalance = true}) {
       </div>
       {showBalance && hasBalance &&
       <div className='ffe-account-selector__details--right'>
-        { balanceWithCurrency(balance, locale) }
+        { balanceWithCurrency(balance, locale, currencyCode) }
       </div>
       }
     </div>

diff --git a/src/account/account-suggestion-multi.js b/src/account/account-suggestion-multi.js
@@ -5,7 +5,7 @@ import {accountFormatter, balanceWithCurrency} from '../util/format';
 import {Account, Locale} from '../util/types';
 
 function AccountSuggestionMulti({account, locale, selected}) {
-  const {accountNumber, balance, name}= account;
+  const {accountNumber, balance, name, currencyCode} = account;
   const hasBalance = balance !== null;
   return (
     <div className='ffe-account-suggestion__account--multi'>
@@ -24,7 +24,7 @@ function AccountSuggestionMulti({account, locale, selected}) {
           </span>
           {hasBalance &&
           <span className='ffe-account-suggestion__balance'>
-            {balanceWithCurrency(balance, locale)}
+            {balanceWithCurrency(balance, locale, currencyCode)}
           </span>
           }
         </div>

diff --git a/src/account/account-suggestion.js b/src/account/account-suggestion.js
@@ -4,7 +4,7 @@ import {accountFormatter, balanceWithCurrency} from '../util/format';
 import {Account, Locale} from '../util/types';
 
 const AccountSuggestionItem = ({account, locale, showBalance = true}) => {
-  const {accountNumber, balance, name}= account;
+  const {accountNumber, balance, name, currencyCode }= account;
   const hasBalance = balance !== null;
   return (
     <div className='ffe-account-suggestion__account'>
@@ -15,7 +15,7 @@ const AccountSuggestionItem = ({account, locale, showBalance = true}) => {
         </span>
         {showBalance && hasBalance &&
         <span className='ffe-account-suggestion__balance'>
-          { balanceWithCurrency(balance, locale)}
+          { balanceWithCurrency(balance, locale, currencyCode)}
         </span>
         }
       </div>

diff --git a/src/util/format.js b/src/util/format.js
@@ -26,7 +26,11 @@ export function accountFormatter(accountNumber) {
   return accountNumber;
 }
 
-export function balanceWithCurrency(balance = '', locale) {
+export function balanceWithCurrency(balance = '', locale, currencyCode) {
+  if (currencyCode && currencyCode !== "NOK") {
+    return `${amountFormatter(balance, locale)} ${currencyCode}`;
+  }
+
   return `${amountFormatter(balance, locale)} ${currencyPostfix[locale]}`;
 }