Merge branch 'frontend-remove-hide-amounts-settings'

Author: shonsirsha

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Use native scrollbars on macOS, iOS and Android
 - Fix address signing fail on screen rotation for Pocket and Bitsurance
 - Restrict selection to text files when importing notes
+- Display the hide amount button by default and remove its settings
 
 # 4.46.3
 - Fix camera access on linux

frontends/web/src/components/hideamountsbutton/hideamountsbutton.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023-2024 Shift Crypto AG
+ * Copyright 2023-2025 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,15 @@
 
 import { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLoad } from '@/hooks/api';
 import { AppContext } from '@/contexts/AppContext';
 import { Button } from '@/components/forms/button';
 import { EyeClosed, EyeOpened } from '@/components/icon';
-import { getConfig } from '@/utils/config';
 import styles from './hideamountsbutton.module.css';
 
 export const HideAmountsButton = () => {
   const { t } = useTranslation();
   const { hideAmounts, toggleHideAmounts } = useContext(AppContext);
-  const config = useLoad(getConfig);
 
-  if (!config || !config.frontend.allowHideAmounts) {
-    return null;
-  }
   return (
     <Button className={styles.button} onClick={toggleHideAmounts} transparent>
       {hideAmounts ? <EyeClosed /> : <EyeOpened />}

frontends/web/src/routes/exchange/exchange.tsx

@@ -126,7 +126,6 @@ export const Exchange = ({ code, accounts, deviceIDs }: TProps) => {
         <div className="innerContainer scrollableContainer">
           <Header title={<h2>{title}</h2>} />
           <div className={[style.exchangeContainer, 'content', 'narrow', 'isVerticallyCentered'].join(' ')}>
-            <h1 className={style.title}>{title}</h1>
             <p className={style.label}>{t('buy.exchange.region')}</p>
             {regions.length ? (
               <>

frontends/web/src/routes/settings/components/appearance/hideAmountsSetting.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023-2024 Shift Crypto AG
+ * Copyright 2023-2025 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import { DefaultCurrencyDropdownSetting } from './components/appearance/defaultC
 import { DisplaySatsToggleSetting } from './components/appearance/displaySatsToggleSetting';
 import { LanguageDropdownSetting } from './components/appearance/languageDropdownSetting';
 import { ActiveCurrenciesDropdownSetting } from './components/appearance/activeCurrenciesDropdownSetting';
-import { HideAmountsSetting } from './components/appearance/hideAmountsSetting';
 import { WithSettingsTabs } from './components/tabs';
 import { MobileHeader } from './components/mobile-header';
 import { Guide } from '@/components/guide/guide';
@@ -62,7 +61,6 @@ export const General = ({ deviceIDs, hasAccounts }: TPagePropsWithSettingsTabs)
                 <ActiveCurrenciesDropdownSetting />
                 <DarkmodeToggleSetting />
                 <DisplaySatsToggleSetting />
-                <HideAmountsSetting />
                 { hasAccounts ? (
                   <>
                     <SubTitle className="m-top-default">