diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0bfcd8b6b..851aad78e6 100644
--- 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
index 25deda2839..efe5a482b4 100644
--- 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}
/>
);
diff --git a/package.json b/package.json
index 2c5445f016..6559ac29a0 100644
--- 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
index abb3f6dd43..246e1611a7 100644
--- 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 (
@@ -13,7 +13,7 @@ function AccountDetails({account, locale, showBalance = true}) {
{showBalance && hasBalance &&
- { balanceWithCurrency(balance, locale) }
+ { balanceWithCurrency(balance, locale, currencyCode) }
}
diff --git a/src/account/account-suggestion-multi.js b/src/account/account-suggestion-multi.js
index dc6dc3e1e6..ce6d96350b 100644
--- 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 (
@@ -24,7 +24,7 @@ function AccountSuggestionMulti({account, locale, selected}) {
{hasBalance &&
- {balanceWithCurrency(balance, locale)}
+ {balanceWithCurrency(balance, locale, currencyCode)}
}
diff --git a/src/account/account-suggestion.js b/src/account/account-suggestion.js
index 326053be2c..b2c4adb93a 100644
--- 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 (
@@ -15,7 +15,7 @@ const AccountSuggestionItem = ({account, locale, showBalance = true}) => {
{showBalance && hasBalance &&
- { balanceWithCurrency(balance, locale)}
+ { balanceWithCurrency(balance, locale, currencyCode)}
}
diff --git a/src/util/format.js b/src/util/format.js
index 434b5a044e..37f207bf63 100644
--- a/src/util/format.js
+++ b/src/util/format.js
@@ -1,5 +1,5 @@
import amountFormatter from 'nfe-amount-formatter';
-import {currencyPostfix} from './types';
+import { currencyAffixNOK } from './types';
const getWeightedSumOfDigits = (accountNumber) => {
const weights = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2, 1];
@@ -26,7 +26,9 @@ export function accountFormatter(accountNumber) {
return accountNumber;
}
-export function balanceWithCurrency(balance = '', locale) {
- return `${amountFormatter(balance, locale)} ${currencyPostfix[locale]}`;
+export function balanceWithCurrency(balance = '', locale, currencyCode) {
+ const amount = amountFormatter(balance, locale);
+ const currencyAffix = (currencyCode && currencyCode !== "NOK")? currencyCode : currencyAffixNOK[locale];
+ return (locale === 'en')? `${currencyAffix} ${amount}` : `${amount} ${currencyAffix}`;
}
diff --git a/src/util/types.js b/src/util/types.js
index 3a7df4cc91..7d550c0266 100644
--- a/src/util/types.js
+++ b/src/util/types.js
@@ -4,7 +4,7 @@ export const nb = 'nb';
export const en = 'en';
export const nn = 'nn';
-export const currencyPostfix = {
+export const currencyAffixNOK = {
[nb]: 'kr',
[nn]: 'kr',
[en]: 'NOK'