frontend: styled multi select for Active Currencies Dropdown / Select

to improve our UI, we'd like to style our Active Currencies multi dropdown.

In this commit we also refactored it, along with the single dropdown component.

Author: shonsirsha

frontends/web/src/api/account.ts

@@ -29,6 +29,11 @@ export type CoinUnit = 'BTC' | 'sat' | 'LTC' | 'ETH' | 'TBTC' | 'tsat' | 'TLTC'
 
 export type ERC20TokenUnit = 'USDT' | 'USDC' | 'LINK' | 'BAT' | 'MKR' | 'ZRX' | 'WBTC' | 'PAXG' | 'SAI' | 'DAI';
 
+export type FiatWithDisplayName = {
+  currency: Fiat,
+  displayName: string
+}
+
 export type Terc20Token = {
   code: string;
   name: string;

frontends/web/src/components/icon/assets/icons/selected-check-light.svg

@@ -52,6 +52,7 @@ import saveSVG from './assets/icons/save.svg';
 import saveLightSVG from './assets/icons/save-light.svg';
 import starSVG from './assets/icons/star.svg';
 import starInactiveSVG from './assets/icons/star-inactive.svg';
+import selectedCheckLight from './assets/icons/selected-check-light.svg';
 import style from './icon.module.css';
 
 export const ExpandOpen = () => (
@@ -156,6 +157,8 @@ export const Save = (props: ImgProps) => (<img src={saveSVG} draggable={false} {
 export const SaveLight = (props: ImgProps) => (<img src={saveLightSVG} draggable={false} {...props} />);
 export const Star = (props: ImgProps) => (<img src={starSVG} draggable={false} {...props} />);
 export const StarInactive = (props: ImgProps) => (<img src={starInactiveSVG} draggable={false} {...props} />);
+// check component for cusotm multi-dropdown select
+export const SelectedCheckLight = (props: ImgProps) => (<img src={selectedCheckLight} draggable={false} {...props} />);
 /**
  * @deprecated Alert is only used for BitBox01 use `Warning` icon instead
  */

frontends/web/src/components/icon/icon.tsx

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Fiat, ConversionUnit, IAmount } from '../../api/account';
+import { Fiat, ConversionUnit, IAmount, FiatWithDisplayName } from '../../api/account';
 import { BtcUnit } from '../../api/coins';
 import { reinitializeAccounts } from '../../api/backend';
 import { share } from '../../decorators/share';
@@ -34,6 +34,25 @@ export interface SharedProps {
 }
 
 export const currencies: Fiat[] = ['AUD', 'BRL', 'CAD', 'CHF', 'CNY', 'EUR', 'GBP', 'HKD', 'ILS', 'JPY', 'KRW', 'NOK', 'RUB', 'SEK', 'SGD', 'USD', 'BTC'];
+export const currenciesWithDisplayName: FiatWithDisplayName[] = [
+  { currency: 'AUD', displayName: 'Australian dollar' },
+  { currency: 'BRL', displayName: 'Brazilian real' },
+  { currency: 'CAD', displayName: 'Canadian dollar' },
+  { currency: 'CHF', displayName: 'Swiss franc' },
+  { currency: 'CNY', displayName: 'Chinese yuan' },
+  { currency: 'EUR', displayName: 'Euro' },
+  { currency: 'GBP', displayName: 'British pound' },
+  { currency: 'HKD', displayName: 'Hong Kong dollar' },
+  { currency: 'ILS', displayName: 'Israeli new shekel' },
+  { currency: 'JPY', displayName: 'Japanese yen' },
+  { currency: 'KRW', displayName: 'South Korean won' },
+  { currency: 'NOK', displayName: 'Norwegian krone' },
+  { currency: 'RUB', displayName: 'Russian ruble' },
+  { currency: 'SEK', displayName: 'Swedish krona' },
+  { currency: 'SGD', displayName: 'Singapore dollar' },
+  { currency: 'USD', displayName: 'United States dollar' },
+  { currency: 'BTC', displayName: 'Bitcoin' }
+];
 
 export const store = new Store<SharedProps>({
   active: 'USD',

frontends/web/src/components/rates/rates.tsx

@@ -14,77 +14,20 @@
  * limitations under the License.
  */
 
-import { useEffect, useState } from 'react';
-import Select, { ActionMeta, MultiValue, MultiValueRemoveProps, components } from 'react-select';
-import { currencies, store, selectFiat, unselectFiat, SharedProps } from '../../../../components/rates/rates';
+import { store, SharedProps, currenciesWithDisplayName } from '../../../../components/rates/rates';
 import { SettingsItem } from '../settingsItem/settingsItem';
-import { Fiat } from '../../../../api/account';
 import { share } from '../../../../decorators/share';
-
-type SelectOption = {
-  label: Fiat;
-  value: Fiat;
-}
-
-type TSelectProps = {
-  options: SelectOption[];
-} & SharedProps;
-
-const ReactSelect = ({ options, active, selected }: TSelectProps) => {
-  const [selectedCurrencies, setSelectedCurrencies] = useState<SelectOption[]>([]);
-
-  useEffect(() => {
-    if (selected.length > 0) {
-      const formattedSelectedCurrencies = selected.map(currency => ({ label: currency, value: currency }));
-      setSelectedCurrencies(formattedSelectedCurrencies);
-    }
-  }, [selected]);
-
-  const MultiValueRemove = (props: MultiValueRemoveProps<SelectOption>) => {
-    const currency = props.data.value;
-    return (
-      currency !== active ?
-        <components.MultiValueRemove {...props}>
-          {'X'}
-        </components.MultiValueRemove>
-        : null
-    );
-  };
-
-  return (
-    <Select
-      classNamePrefix="react-select"
-      isSearchable
-      isClearable={false}
-      components={{ MultiValueRemove }}
-      isMulti
-      value={selectedCurrencies}
-      onChange={(selectedFiats: MultiValue<SelectOption>, meta: ActionMeta<SelectOption>) => {
-        switch (meta.action) {
-        case 'remove-value':
-          if (selectedFiats.length > 0) {
-            const unselectedFiat = meta.removedValue.value;
-            unselectFiat(unselectedFiat);
-          }
-          break;
-        case 'select-option':
-          const selectedFiat = selectedFiats[selectedFiats.length - 1].value as Fiat;
-          selectFiat(selectedFiat);
-        }
-      }}
-      options={options}
-    />);
-};
+import { ActiveCurrenciesDropdown } from '../dropdowns/activecurrenciesdropdown';
 
 const ActiveCurrenciesDropdownSetting = ({ selected, active }: SharedProps) => {
-  const formattedCurrencies = currencies.map((currency) => ({ label: currency, value: currency }));
+  const formattedCurrencies = currenciesWithDisplayName.map((fiat) => ({ label: `${fiat.displayName} (${fiat.currency})`, value: fiat.currency }));
   return (
     <SettingsItem
       collapseOnSmall
       settingName="Active Currencies"
       secondaryText="These additional currencies can be toggled through on your account page."
       extraComponent={
-        <ReactSelect
+        <ActiveCurrenciesDropdown
           options={formattedCurrencies}
           active={active}
           selected={selected}

frontends/web/src/routes/new-settings/components/appearance/activeCurrenciesDropdownSetting.tsx

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { currencies, selectFiat, setActiveFiat, store } from '../../../../components/rates/rates';
-import { SingleDropdown } from '../singledropdown/singledropdown';
+import { currenciesWithDisplayName, selectFiat, setActiveFiat, store } from '../../../../components/rates/rates';
+import { SingleDropdown } from '../dropdowns/singledropdown';
 import { SettingsItem } from '../settingsItem/settingsItem';
 import { Fiat } from '../../../../api/account';
 
 export const DefaultCurrencyDropdownSetting = () => {
-  const formattedCurrencies = currencies.map((currency) => ({ label: currency, value: currency }));
-
+  const formattedCurrencies = currenciesWithDisplayName.map((fiat) => ({ label: `${fiat.displayName} (${fiat.currency})`, value: fiat.currency }));
+  const defaultValueLabel = currenciesWithDisplayName.find(fiat => fiat.currency === store.state.active)?.displayName;
   return (
     <SettingsItem
       settingName="Default Currency"
@@ -36,7 +36,10 @@ export const DefaultCurrencyDropdownSetting = () => {
               selectFiat(fiat);
             }
           }}
-          defaultValue={{ label: store.state.active, value: store.state.active }}
+          defaultValue={{
+            label: defaultValueLabel ? `${defaultValueLabel} (${store.state.active})` : store.state.active,
+            value: store.state.active
+          }}
         />
       }
     />

frontends/web/src/routes/new-settings/components/appearance/defaultCurrencyDropdownSetting.tsx

@@ -18,7 +18,7 @@ import { SettingsItem } from '../settingsItem/settingsItem';
 import { useTranslation } from 'react-i18next';
 import { TLanguagesList } from '../../../../components/language/types';
 import { getSelectedIndex } from '../../../../utils/language';
-import { SingleDropdown } from '../singledropdown/singledropdown';
+import { SingleDropdown } from '../dropdowns/singledropdown';
 
 const defaultLanguages: TLanguagesList = [
   { code: 'ar', display: 'العربية' },

frontends/web/src/routes/new-settings/components/appearance/languageDropdownSetting.tsx

@@ -0,0 +1,48 @@
+.select :global(.react-select__input-container) {
+    position: absolute;
+    top: -2px;
+    left: 6px;
+}
+
+.select :global(.react-select__option) {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+}
+
+/*displays only first 3 currencies, the rest gets hidden*/
+.select :global(.react-select__multi-value):nth-child(n + 4){
+    display: none;
+}
+
+
+/*
+displays ', ' as a pseudo component for all currency component
+except the last displayed component (the 3rd currency component).
+
+The reason for :nth-last-child(2) instead of just :last-child is because there's an extra
+component created by react-select after the actual last currency component. 
+
+So, we're targetting the second to last component here, 
+which is the last selected currency in the DOM.
+*/
+.select:not(.hideMultiSelect) :global(.react-select__multi-value):not(:nth-last-child(2))::after {
+    content: ', ';
+}
+
+/*
+displays '...' as a pseudo component of the 3rd currency and only when there's more than 3 selected.
+:nth-last-child(2) is used for the same reason as above
+*/
+.select:not(.hideMultiSelect) :global(.react-select__multi-value):nth-child(3):not(:nth-last-child(2))::after {
+    content: ' ...';
+}
+
+.select.hideMultiSelect :global(.react-select__multi-value) {
+    display: none;
+}
+
+.select :global(.react-select__value-container--is-multi) {
+    height: var(--item-height-xsmall);
+}

frontends/web/src/routes/new-settings/components/dropdowns/activecurrenciesdropdown.module.css

@@ -0,0 +1,81 @@
+import { useEffect, useState } from 'react';
+import Select, { ActionMeta, DropdownIndicatorProps, OptionProps, components } from 'react-select';
+import { selectFiat, unselectFiat, SharedProps } from '../../../../components/rates/rates';
+import { Fiat } from '../../../../api/account';
+import { SelectedCheckLight } from '../../../../components/icon';
+import dropdownStyles from './dropdowns.module.css';
+import activeCurrenciesDropdownStyle from './activecurrenciesdropdown.module.css';
+
+type SelectOption = {
+    label: String;
+    value: Fiat;
+  }
+
+type TSelectProps = {
+    options: SelectOption[];
+  } & SharedProps;
+
+
+// a multi-select dropdown
+export const ActiveCurrenciesDropdown = ({ options, active, selected }: TSelectProps) => {
+  const [selectedCurrencies, setSelectedCurrencies] = useState<SelectOption[]>([]);
+  const [search, setSearch] = useState('');
+
+  useEffect(() => {
+    if (selected.length > 0) {
+      const formattedSelectedCurrencies = selected.map(currency => ({ label: currency, value: currency }));
+      setSelectedCurrencies(formattedSelectedCurrencies);
+    }
+  }, [selected]);
+
+  const DropdownIndicator = (props: DropdownIndicatorProps<SelectOption, true>) => {
+    return (
+      <components.DropdownIndicator {...props}>
+        <div className={dropdownStyles.dropdown} />
+      </components.DropdownIndicator>
+    );
+  };
+
+  const Option = (props: OptionProps<SelectOption, true>) => {
+    const { label, value } = props.data;
+    const selected = selectedCurrencies.findIndex(currency => currency.value === value) >= 0;
+    return (
+      <components.Option {...props}>
+        <span>{label}</span>
+        {selected ? <SelectedCheckLight /> : null}
+      </components.Option>
+    );
+  };
+  return (
+    <Select
+      className={`
+         ${dropdownStyles.select}
+         ${activeCurrenciesDropdownStyle.select}
+         ${search.length > 0 ? activeCurrenciesDropdownStyle.hideMultiSelect : ''}
+         `}
+      classNamePrefix="react-select"
+      isSearchable
+      isClearable={false}
+      components={{ DropdownIndicator, IndicatorSeparator: () => null, MultiValueRemove: () => null, Option }}
+      isMulti
+      closeMenuOnSelect={false}
+      hideSelectedOptions={false}
+      value={[...selectedCurrencies].reverse()}
+      onInputChange={(newValue) => setSearch(newValue)}
+      onChange={(_, meta: ActionMeta<SelectOption>) => {
+        switch (meta.action) {
+        case 'select-option':
+          if (meta.option) {
+            selectFiat(meta.option.value);
+          }
+          break;
+        case 'deselect-option':
+          if (meta.option && meta.option.value !== active) {
+            unselectFiat(meta.option.value);
+          }
+        }
+
+      }}
+      options={options}
+    />);
+};