diff --git a/packages/suite/src/components/firmware/FirmwareInitial.tsx b/packages/suite/src/components/firmware/FirmwareInitial.tsx
index bdb60b586d2..35e5e1efdde 100644
--- a/packages/suite/src/components/firmware/FirmwareInitial.tsx
+++ b/packages/suite/src/components/firmware/FirmwareInitial.tsx
@@ -163,14 +163,7 @@ export const FirmwareInitial = ({
if (bitcoinOnlyOffer) {
// Installing Bitcoin-only firmware in onboarding
content = {
- heading: (
- ,
- }}
- />
- ),
+ heading: ,
description: (
@@ -187,24 +180,14 @@ export const FirmwareInitial = ({
onClick={() => installFirmware(FirmwareType.Regular)}
multipleDevicesConnected={multipleDevicesConnected}
>
- ,
- }}
- />
+
installFirmware(targetType)}
multipleDevicesConnected={multipleDevicesConnected}
>
- ,
- }}
- />
+
),
@@ -220,13 +203,11 @@ export const FirmwareInitial = ({
{chunks},
button: chunks => (
setBitcoinOnlyOffer(true)}>
{chunks}
),
- bitcoinOnly: ,
}}
/>
),
@@ -293,10 +274,6 @@ export const FirmwareInitial = ({
shouldSwitchFirmwareType,
isBitcoinOnlyAvailable,
})}
- values={{
- bitcoinOnly: ,
- regular: ,
- }}
/>
),
body: (
diff --git a/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx b/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
index d6069d5f90b..fa976a7267e 100644
--- a/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
+++ b/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
@@ -30,7 +30,7 @@ const checklistItems = [
},
{
icon: 'chat',
- content: {chunks} }} />,
+ content: ,
},
] as const;
diff --git a/packages/suite/src/components/suite/Translation.tsx b/packages/suite/src/components/suite/Translation.tsx
index f832863a91d..9768dddd681 100644
--- a/packages/suite/src/components/suite/Translation.tsx
+++ b/packages/suite/src/components/suite/Translation.tsx
@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { ReactElement, ReactNode } from 'react';
import { FormattedMessage } from 'react-intl';
import {
@@ -19,13 +19,26 @@ type OwnProps = {
export type ExtendedMessageDescriptor = CommonExtendedMessageDescriptor;
type MsgType = OwnProps & ExtendedMessageDescriptor;
+const COMMON_TRANSLATION_FORMATTERS = {
+ b: (chunks: ReactElement) => {chunks},
+ i: (chunks: ReactElement) => {chunks},
+};
+
export const isMsgType = (
props: MsgType | ReactNode | ExtendedMessageDescriptor | Date | FormatXMLElementFn,
): props is MsgType =>
typeof props === 'object' && props !== null && (props as MsgType).id !== undefined;
export const Translation = (props: MsgType) => {
- const values: Record = {};
+ const COMMON_TRANSLATION_PLACEHOLDER_MAP = {
+ bitcoinOnly: ,
+ regular: ,
+ };
+
+ const values: Record = {
+ ...COMMON_TRANSLATION_FORMATTERS,
+ ...COMMON_TRANSLATION_PLACEHOLDER_MAP,
+ };
// message passed via props (id, defaultMessage, values)
Object.keys(props.values || []).forEach(key => {
// Iterates through all values. The entry may also contain a MessageDescriptor.
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
index e4bf5bd6d96..ff32722721b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
@@ -36,10 +36,7 @@ export const PinModal = ({ device, ...rest }: PinModalProps) => {
}
description={
- {text} }}
- />
+
}
onCancel={onCancel}
isCancelable
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
index 641730b86d7..db08be50b8e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
@@ -26,7 +26,6 @@ export const TransactionReviewEvmExplanation = ({
id="TR_EVM_EXPLANATION_SEND_MODAL_DESCRIPTION"
values={{
network: network.name,
- b: text => {text},
}}
/>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorStopCoinjoinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorStopCoinjoinModal.tsx
index ff58083e293..4322b50ebaf 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorStopCoinjoinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorStopCoinjoinModal.tsx
@@ -58,12 +58,7 @@ export const DisableTorStopCoinjoinModal = ({
>
<>
- {chunks},
- }}
- />
+
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/RequestEnableTorModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/RequestEnableTorModal.tsx
index 279a8e2d841..242c9658de2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/RequestEnableTorModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/RequestEnableTorModal.tsx
@@ -78,12 +78,7 @@ export const RequestEnableTorModal = ({ onCancel, decision }: RequestEnableTorMo
>
<>
- {chunks},
- }}
- />
+
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
index f7a3db439e5..b90dac1de58 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
@@ -114,7 +114,6 @@ export const UnecoCoinjoinModal = () => {
symbol={symbol}
/>
),
- b: chunk => {chunk},
}}
/>
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TorDisconnected.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TorDisconnected.tsx
index d369d242cc4..7154dd7ec1a 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TorDisconnected.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TorDisconnected.tsx
@@ -26,12 +26,7 @@ export const TorDisconnected = () => {
),
}}
>
- {chunks},
- }}
- />
+
);
};
diff --git a/packages/suite/src/views/dashboard/PromoBanner.tsx b/packages/suite/src/views/dashboard/PromoBanner.tsx
index a0efd35c073..621586e4ac3 100644
--- a/packages/suite/src/views/dashboard/PromoBanner.tsx
+++ b/packages/suite/src/views/dashboard/PromoBanner.tsx
@@ -238,10 +238,7 @@ export const PromoBanner = () => {
)}
- {text} }}
- id="TR_MOBILE_APP_PROMO_TEXT_FOOTER"
- />
+
{
),
- bitcoinOnly: ,
- regular: ,
}}
/>
diff --git a/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx b/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
index bbba9f388d3..a6aacef9cc3 100644
--- a/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
@@ -90,13 +90,7 @@ export const FirmwareTypeChange = ({ isDeviceLocked }: FirmwareTypeProps) => {
data-testid="@settings/device/switch-fw-type-button"
isDisabled={isDeviceLocked}
>
- ,
- regular: ,
- }}
- />
+
)}