diff --git a/addon/components/currency-select.js b/addon/components/currency-select.js
index f58e57e..5abda5f 100644
--- a/addon/components/currency-select.js
+++ b/addon/components/currency-select.js
@@ -15,12 +15,12 @@ export default class CurrencySelectComponent extends Component {
 
         let whois = this.currentUser.getOption('whois');
 
-        this.currency = this.args.currency ?? whois?.currency?.code ?? 'USD';
+        this.currency = this.args.currency ?? this.args.value ?? whois?.currency?.code ?? 'USD';
         this.currencyData = this.args.currencyData ?? getCurrency(this.currency);
     }
 
     @action onChange(currency) {
-        const { onChange, onCurrencyChange } = this.args;
+        const { onChange, onCurrencyChange, onSelect } = this.args;
 
         this.currency = currency.code;
         this.currencyData = currency;
@@ -29,6 +29,10 @@ export default class CurrencySelectComponent extends Component {
             onCurrencyChange(currency.code, currency);
         }
 
+        if (typeof onSelect === 'function') {
+            onSelect(currency.code, currency);
+        }
+
         if (typeof onChange === 'function') {
             onChange(currency);
         }
diff --git a/addon/components/modals/create-or-join-org.hbs b/addon/components/modals/create-or-join-org.hbs
index b345687..a9966ae 100644
--- a/addon/components/modals/create-or-join-org.hbs
+++ b/addon/components/modals/create-or-join-org.hbs
@@ -40,7 +40,7 @@
                 <PhoneInput @value={{@options.phone}} @onInput={{fn (mut @options.phone)}} class="form-input w-full" />
             </InputGroup>
             <InputGroup @name="Organization currency">
-                <CurrencySelect @value={{@options.currency}} @onSelect={{fn (mut @options.currency)}} @triggerClass="w-full form-select" />
+                <CurrencySelect @currency={{@options.currency}} @onCurrencyChange={{fn (mut @options.currency)}} @triggerClass="w-full form-select" />
             </InputGroup>
         {{/if}}
     </div>
diff --git a/addon/components/modals/verify-by-sms.hbs b/addon/components/modals/verify-by-sms.hbs
index ddf653a..28dfb9a 100644
--- a/addon/components/modals/verify-by-sms.hbs
+++ b/addon/components/modals/verify-by-sms.hbs
@@ -1,25 +1,9 @@
 <Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
     <div class="modal-body-container">
-        <div class="bg-yellow-50 rounded shadow-sm border-l-4 border-yellow-400 p-4 mb-5">
-            <div class="flex">
-                <div class="flex-shrink-0">
-                    <svg class="h-5 w-5 text-yellow-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                        <path
-                            fill-rule="evenodd"
-                            d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
-                            clip-rule="evenodd"
-                        ></path>
-                    </svg>
-                </div>
-                <div class="ml-3 flex items-center">
-                    <span class="font-extrabold text-yellow-800">Let's verify your phone number instead.</span>
-                </div>
-            </div>
-            <div class="py-3">
-                <p class="text-yellow-700">Confirm your phone number below and click send to receive a verification code by SMS.</p>
-            </div>
-        </div>
-
+         <InfoBlock @type="info" @icon="lightbulb" @iconSize="lg" class="mb-5">
+            <div class="font-extrabold">Let's verify your phone number instead.</div>
+            <div>Confirm your phone number below and click send to receive a verification code by SMS.</div>
+        </InfoBlock>
         <InputGroup @name="Verify your phone number" @helpText="Have a second look and confirm your phone number is correct.">
             <PhoneInput @value={{@options.phone}} @onInput={{fn (mut @options.phone)}} class="form-input input-lg w-full" />
         </InputGroup>
diff --git a/addon/components/modals/verify-email.hbs b/addon/components/modals/verify-email.hbs
index eb32229..660a4b6 100644
--- a/addon/components/modals/verify-email.hbs
+++ b/addon/components/modals/verify-email.hbs
@@ -1,24 +1,9 @@
 <Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
     <div class="modal-body-container">
-        <div class="bg-blue-50 rounded shadow-sm border-l-4 border-blue-400 p-4 mb-5">
-            <div class="flex">
-                <div class="flex-shrink-0">
-                    <svg class="h-5 w-5 text-blue-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                        <path
-                            fill-rule="evenodd"
-                            d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
-                            clip-rule="evenodd"
-                        ></path>
-                    </svg>
-                </div>
-                <div class="ml-3 flex items-center">
-                    <span class="font-extrabold text-blue-800">Verify your email address</span>
-                </div>
-            </div>
-            <div class="py-3">
-                <p class="text-blue-700">Re-verify your email address and click Send to continue.</p>
-            </div>
-        </div>
+        <InfoBlock @type="info" @icon="lightbulb" @iconSize="lg" class="mb-5">
+            <div class="font-extrabold">Verify your email address.</div>
+            <div>Re-verify your email address and click Send to continue.</div>
+        </InfoBlock>
         {{#if @options.sent}}
             <InputGroup
                 @type="tel"
diff --git a/addon/utils/get-currency.js b/addon/utils/get-currency.js
index 0317c3c..85518a4 100644
--- a/addon/utils/get-currency.js
+++ b/addon/utils/get-currency.js
@@ -23,6 +23,42 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'AF',
+        name: 'Afghanistan',
+        emoji: '🇦🇫',
+        code: 'AFN',
+        title: 'Afghan Afghani',
+        symbol: '؋',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'AO',
+        name: 'Angola',
+        emoji: '🇦🇴',
+        code: 'AOA',
+        title: 'Angolan Kwanza',
+        symbol: 'Kz',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'AZ',
+        name: 'Azerbaijan',
+        emoji: '🇦🇿',
+        code: 'AZN',
+        title: 'Azerbaijani Manat',
+        symbol: '₼',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         code: 'EUR',
         title: 'Euro',
@@ -34,6 +70,42 @@ const currencies = [
         name: 'European Union',
         emoji: '🇪🇺',
     },
+    {
+        iso2: 'XX',
+        name: 'West African Economic and Monetary Union',
+        emoji: '🇸🇳',
+        code: 'XOF',
+        title: 'West African CFA Franc',
+        symbol: 'Fr',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'XX',
+        name: 'Central African CFA Franc',
+        emoji: '🇨🇲',
+        code: 'XAF',
+        title: 'Central African CFA Franc',
+        symbol: 'FCFA',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'XX',
+        name: 'CFP Franc',
+        emoji: '🇵🇫',
+        code: 'XPF',
+        title: 'CFP Franc',
+        symbol: 'Fr',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'AE',
         name: 'United Arab Emirates',
@@ -190,6 +262,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'BI',
+        name: 'Burundi',
+        emoji: '🇧🇮',
+        code: 'BIF',
+        title: 'Burundian Franc',
+        symbol: 'FBu',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '', // No subunits used
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'BW',
         name: 'Botswana',
@@ -214,6 +298,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'CL',
+        name: 'Chile',
+        emoji: '🇨🇱',
+        code: 'CLP',
+        title: 'Chilean Peso',
+        symbol: 'CLP$',
+        precision: 0,
+        thousandSeparator: '.',
+        decimalSeparator: '',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'CN',
         name: 'China',
@@ -250,6 +346,18 @@ const currencies = [
         decimalSeparator: ',',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'CD',
+        name: 'Democratic Republic of the Congo',
+        emoji: '🇨🇩',
+        code: 'CDF',
+        title: 'Congolese Franc',
+        symbol: 'FC',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '', // No subunits used
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'CR',
         name: 'Costa Rica',
@@ -274,6 +382,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'CU',
+        name: 'Cuba',
+        emoji: '🇨🇺',
+        code: 'CUP',
+        title: 'Cuban Peso',
+        symbol: 'CUP$',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'CW',
         name: 'Curaçao',
@@ -286,6 +406,18 @@ const currencies = [
         decimalSeparator: ',',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'CY',
+        name: 'Cyprus',
+        emoji: '🇨🇾',
+        code: 'CYP',
+        title: 'Cyprus Pound',
+        symbol: '£',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'KY',
         name: 'Cayman Islands',
@@ -370,6 +502,30 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'GH',
+        name: 'Ghana',
+        emoji: '🇬🇭',
+        code: 'GHS',
+        title: 'Ghanaian Cedi',
+        symbol: 'GH₵',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'GH',
+        name: 'Ghana',
+        emoji: '🇬🇭',
+        code: 'GHC',
+        title: 'Ghana, Cedi',
+        symbol: 'GH₵',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'GI',
         name: 'Gibraltar',
@@ -394,6 +550,42 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'GN',
+        name: 'Guinea',
+        emoji: '🇬🇳',
+        code: 'GNF',
+        title: 'Guinean Franc',
+        symbol: 'FG',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '', // No subunits used
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'GY',
+        name: 'Guyana',
+        emoji: '🇬🇾',
+        code: 'GYD',
+        title: 'Guyanaese Dollar',
+        symbol: '$',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'HT',
+        name: 'Haiti',
+        emoji: '🇭🇹',
+        code: 'HTG',
+        title: 'Haitian Gourde',
+        symbol: 'G',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'HK',
         name: 'Hong Kong',
@@ -478,6 +670,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'IQ',
+        name: 'Iraq',
+        emoji: '🇮🇶',
+        code: 'IQD',
+        title: 'Iraqi Dinar',
+        symbol: 'ع.د',
+        precision: 3, // Iraqi Dinar has three decimal places
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'IS',
         name: 'Iceland',
@@ -574,6 +778,42 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'KG',
+        name: 'Kyrgyzstan',
+        emoji: '🇰🇬',
+        code: 'KGS',
+        title: 'Kyrgyzstani Som',
+        symbol: 'сом',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'LV',
+        name: 'Latvia',
+        emoji: '🇱🇻',
+        code: 'LVL',
+        title: 'Latvian Lats',
+        symbol: 'Ls',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'LA',
+        name: 'Laos',
+        emoji: '🇱🇦',
+        code: 'LAK',
+        title: 'Lao Kip',
+        symbol: '₭',
+        precision: 0, // No subunits used
+        thousandSeparator: ',',
+        decimalSeparator: '', // No subunits used
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'LB',
         name: 'Lebanon',
@@ -586,6 +826,42 @@ const currencies = [
         decimalSeparator: '',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'LS',
+        name: 'Lesotho',
+        emoji: '🇱🇸',
+        code: 'LSL',
+        title: 'Lesotho Loti',
+        symbol: 'M',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'LR',
+        name: 'Liberia',
+        emoji: '🇱🇷',
+        code: 'LRD',
+        title: 'Liberian Dollar',
+        symbol: '$',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'LY',
+        name: 'Libya',
+        emoji: '🇱🇾',
+        code: 'LYD',
+        title: 'Libyan Dinar',
+        symbol: 'ل.د',
+        precision: 3, // Libyan Dinar has three decimal places
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'LI',
         name: 'Liechtenstein',
@@ -598,6 +874,30 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'LT',
+        name: 'Lithuania',
+        emoji: '🇱🇹',
+        code: 'LTL',
+        title: 'Lithuanian Litas',
+        symbol: ' Lt',
+        precision: 2,
+        thousandSeparator: ' ',
+        decimalSeparator: ',',
+        symbolPlacement: 'after',
+    },
+    {
+        iso2: 'MT',
+        name: 'Malta',
+        emoji: '🇲🇹',
+        code: 'MTL',
+        title: 'Maltese Lira',
+        symbol: 'Lm',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'MX',
         name: 'Mexico',
@@ -610,6 +910,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'MZ',
+        name: 'Mozambique',
+        emoji: '🇲🇿',
+        code: 'MZM',
+        title: 'Mozambique Metical',
+        symbol: 'MT',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'MK',
         name: 'North Macedonia',
@@ -622,6 +934,30 @@ const currencies = [
         decimalSeparator: ',',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'MW',
+        name: 'Malawi',
+        emoji: '🇲🇼',
+        code: 'MWK',
+        title: 'Malawian Kwacha',
+        symbol: 'MK',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'MV',
+        name: 'Maldives',
+        emoji: '🇲🇻',
+        code: 'MVR',
+        title: 'Maldivian Rufiyaa',
+        symbol: 'Rf',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'MN',
         name: 'Mongolia',
@@ -634,6 +970,30 @@ const currencies = [
         decimalSeparator: '',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'MD',
+        name: 'Moldova',
+        emoji: '🇲🇩',
+        code: 'MDL',
+        title: 'Moldovan Leu',
+        symbol: 'L',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'MO',
+        name: 'Macau',
+        emoji: '🇲🇴',
+        code: 'MOP',
+        title: 'Macanese Pataca',
+        symbol: 'P',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'MU',
         name: 'Mauritius',
@@ -658,6 +1018,30 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'MM',
+        name: 'Myanmar',
+        emoji: '🇲🇲',
+        code: 'MMK',
+        title: 'Burmese Kyat',
+        symbol: 'K',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'NA',
+        name: 'Namibia',
+        emoji: '🇳🇦',
+        code: 'NAD',
+        title: 'Namibian Dollar',
+        symbol: '$',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'NG',
         name: 'Nigeria',
@@ -766,6 +1150,18 @@ const currencies = [
         decimalSeparator: ',',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'RO',
+        name: 'Romania',
+        emoji: '🇷🇴',
+        code: 'ROL',
+        title: 'Romania, Old Leu',
+        symbol: null,
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'RU',
         name: 'Russia',
@@ -802,6 +1198,30 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'SK',
+        name: 'Slovakia',
+        emoji: '🇸🇰',
+        code: 'SKK',
+        title: 'Slovak Koruna',
+        symbol: ' SKK',
+        precision: 2,
+        thousandSeparator: ' ',
+        decimalSeparator: ',',
+        symbolPlacement: 'after',
+    },
+    {
+        iso2: 'SI',
+        name: 'Slovenia',
+        emoji: '🇸🇮',
+        code: 'SIT',
+        title: 'Slovenia, Tolar',
+        symbol: null,
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'SV',
         name: 'El Salvador',
@@ -862,6 +1282,18 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'TJ',
+        name: 'Tajikistan',
+        emoji: '🇹🇯',
+        code: 'TJS',
+        title: 'Tajikistani Somoni',
+        symbol: 'ЅМ',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'TW',
         name: 'Taiwan',
@@ -910,6 +1342,42 @@ const currencies = [
         decimalSeparator: ',',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'TM',
+        name: 'Turkmenistan',
+        emoji: '🇹🇲',
+        code: 'TMT',
+        title: 'Turkmenistani Manat',
+        symbol: 'm',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'TN',
+        name: 'Tunisia',
+        emoji: '🇹🇳',
+        code: 'TND',
+        title: 'Tunisian Dinar',
+        symbol: 'د.ت',
+        precision: 3, // Tunisian Dinar has three decimal places
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'TT',
+        name: 'Trinidad and Tobago',
+        emoji: '🇹🇹',
+        code: 'TTD',
+        title: 'Trinidad and Tobago Dollar',
+        symbol: '$',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'TZ',
         name: 'Tanzania',
@@ -946,6 +1414,66 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'UG',
+        name: 'Uganda',
+        emoji: '🇺🇬',
+        code: 'UGX',
+        title: 'Ugandan Shilling',
+        symbol: 'USh',
+        precision: 0,
+        thousandSeparator: ',',
+        decimalSeparator: '/',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'UY',
+        name: 'Uruguay',
+        emoji: '🇺🇾',
+        code: 'UYU',
+        title: 'Peso Uruguayo',
+        symbol: '$U ',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'UZ',
+        name: 'Uzbekistan',
+        emoji: '🇺🇿',
+        code: 'UZS',
+        title: 'Uzbekistani Som',
+        symbol: 'лв',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'VE',
+        name: 'Venezuela',
+        emoji: '🇻🇪',
+        code: 'VEB',
+        title: 'Venezuela, Bolivar',
+        symbol: 'Bs.',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'VE',
+        name: 'Venezuela',
+        emoji: '🇻🇪',
+        code: 'VEF',
+        title: 'Venezuela Bolivares Fuertes',
+        symbol: 'Bs.',
+        precision: 2,
+        thousandSeparator: '.',
+        decimalSeparator: ',',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'VN',
         name: 'Vietnam',
@@ -970,6 +1498,18 @@ const currencies = [
         decimalSeparator: '',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'WS',
+        name: 'Samoa',
+        emoji: '🇼🇸',
+        code: 'WST',
+        title: 'Samoan Tala',
+        symbol: 'T',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
     {
         iso2: 'ZA',
         name: 'South Africa',
@@ -982,6 +1522,30 @@ const currencies = [
         decimalSeparator: '.',
         symbolPlacement: 'before',
     },
+    {
+        iso2: 'ZM',
+        name: 'Zambia',
+        emoji: '🇿🇲',
+        code: 'ZMW',
+        title: 'Zambian Kwacha',
+        symbol: 'ZK',
+        precision: 2,
+        thousandSeparator: ',',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
+    {
+        iso2: 'ZW',
+        name: 'Zimbabwe',
+        emoji: '🇿🇼',
+        code: 'ZWD',
+        title: 'Zimbabwe Dollar',
+        symbol: 'Z$',
+        precision: 2,
+        thousandSeparator: ' ',
+        decimalSeparator: '.',
+        symbolPlacement: 'before',
+    },
 ];
 
 export default function getCurrency(code) {
diff --git a/package.json b/package.json
index c051422..e5dd4e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-ui",
-    "version": "0.2.35",
+    "version": "0.2.36",
     "description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
     "keywords": [
         "fleetbase-ui",