Merge pull request #584 from Concordium/ui-update/text-color-fix

UI update/text color fix
Concordium · Dec 18, 2024 · 2667cf2 · 2667cf2
2 parents 5ebf60a + 99299eb
commit 2667cf2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/...s/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Stake/DelegatorStake.tsx b/...s/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Stake/DelegatorStake.tsx
@@ -78,7 +78,7 @@ function HighStakeWarning({ onContinue, ...props }: HighStakeNoticeProps) {
         <FullscreenNotice {...props}>
             <Page>
                 <Page.Top heading={t('title')} />
-                {t('description', { threshold: STAKE_WARNING_THRESHOLD.toString() })}
+                <Text.Capture>{t('description', { threshold: STAKE_WARNING_THRESHOLD.toString() })}</Text.Capture>
                 <Page.Footer>
                     <Button.Main label={t('buttonContinue')} onClick={onContinue} />
                     <Button.Main label={t('buttonBack')} onClick={props.onClose} />

diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/TransactionFlow.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/TransactionFlow.tsx
@@ -11,6 +11,8 @@ import { formatCcdAmount } from '@popup/popupX/shared/utils/helpers';
 import FullscreenNotice, { FullscreenNoticeProps } from '@popup/popupX/shared/FullscreenNotice';
 import Page from '@popup/popupX/shared/Page';
 import Button from '@popup/popupX/shared/Button';
+import Text from '@popup/popupX/shared/Text';
+
 import DelegatorStake from './Stake';
 import DelegatorType from './Type';
 import { configureDelegatorPayloadFromForm, type DelegatorForm } from './util';
@@ -22,7 +24,7 @@ function NoChangesNotice(props: FullscreenNoticeProps) {
         <FullscreenNotice {...props}>
             <Page>
                 <Page.Top heading={t('title')} />
-                {t('description')}
+                <Text.Capture>{t('description')}</Text.Capture>
                 <Page.Footer>
                     <Button.Main label={t('buttonBack')} onClick={props.onClose} />
                 </Page.Footer>

diff --git a/...s/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Stake/ValidatorStake.tsx b/...s/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Stake/ValidatorStake.tsx
@@ -31,7 +31,7 @@ function HighStakeWarning({ onContinue, ...props }: HighStakeNoticeProps) {
         <FullscreenNotice {...props}>
             <Page>
                 <Page.Top heading={t('title')} />
-                {t('description', { threshold: STAKE_WARNING_THRESHOLD.toString() })}
+                <Text.Capture>{t('description', { threshold: STAKE_WARNING_THRESHOLD.toString() })}</Text.Capture>
                 <Page.Footer>
                     <Button.Main label={t('buttonContinue')} onClick={onContinue} />
                     <Button.Main label={t('buttonBack')} onClick={props.onClose} />

diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/TransactionFlow.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/TransactionFlow.tsx
@@ -12,6 +12,7 @@ import Button from '@popup/popupX/shared/Button';
 import { useBlockChainParametersAboveV0 } from '@popup/shared/BlockChainParametersProvider';
 import { useSelectedAccountInfo } from '@popup/shared/AccountInfoListenerContext/AccountInfoListenerContext';
 import { formatCcdAmount } from '@popup/popupX/shared/utils/helpers';
+import Text from '@popup/popupX/shared/Text';
 
 import { ValidatorForm, ValidatorFormExisting, configureValidatorFromForm } from './util';
 import ValidatorStake from './Stake';
@@ -27,7 +28,7 @@ function NoChangesNotice(props: FullscreenNoticeProps) {
         <FullscreenNotice {...props}>
             <Page>
                 <Page.Top heading={t('title')} />
-                {t('description')}
+                <Text.Capture>{t('description')}</Text.Capture>
                 <Page.Footer>
                     <Button.Main label={t('buttonBack')} onClick={props.onClose} />
                 </Page.Footer>

diff --git a/packages/browser-wallet/src/popup/popupX/styles/_base.scss b/packages/browser-wallet/src/popup/popupX/styles/_base.scss
@@ -1,5 +1,7 @@
 &:not(html) {
     background-color: rgba($color-black, 0.9);
+    color: $color-white;
+    font-family: $t-font-family-satoshi;
 }
 
 .bg {