diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index 1e494deb8..156ce53e0 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -328,7 +328,7 @@ export const unifiedCircleIcon = (color = 'white'): string => `
`;
export const unitBitcoinIcon = (color = 'white'): string => `
-`;
+`;
export const unitFiatIcon = (color = 'white'): string => `
`;
diff --git a/src/assets/svgs/raw/unitBitcoin.svg b/src/assets/svgs/raw/unitBitcoin.svg
index 61e6ea66b..003573d4a 100644
--- a/src/assets/svgs/raw/unitBitcoin.svg
+++ b/src/assets/svgs/raw/unitBitcoin.svg
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/src/components/AppStatus.tsx b/src/components/AppStatus.tsx
index 4f2db9043..6e6ca1de3 100644
--- a/src/components/AppStatus.tsx
+++ b/src/components/AppStatus.tsx
@@ -17,11 +17,16 @@ import { ArrowsClockwiseIcon, PowerIcon, WarningIcon } from '../styles/icons';
import { BodyMSB } from '../styles/text';
import { IThemeColors } from '../styles/themes';
-type Props = PressableProps & { showText?: boolean; showReady?: boolean };
+type Props = PressableProps & {
+ showText?: boolean;
+ showReady?: boolean;
+ color?: keyof IThemeColors;
+};
const AppStatus = ({
showText = false,
showReady = false,
+ color: overrideColor,
style,
testID,
onPress,
@@ -99,7 +104,7 @@ const AppStatus = ({
return 'red';
};
- const color = appStatusColor();
+ const color = overrideColor || appStatusColor();
if (appStatus === 'ready' && !showReady) {
return null;
diff --git a/src/components/widgets/CalculatorWidget.tsx b/src/components/widgets/CalculatorWidget.tsx
index 9d4bc02b5..fba0f81a8 100644
--- a/src/components/widgets/CalculatorWidget.tsx
+++ b/src/components/widgets/CalculatorWidget.tsx
@@ -113,7 +113,7 @@ const CalculatorWidget = ({
}}
/>
- BTC
+ BITCOIN
diff --git a/src/components/widgets/FactsWidget.tsx b/src/components/widgets/FactsWidget.tsx
index 1762162ae..1be673842 100644
--- a/src/components/widgets/FactsWidget.tsx
+++ b/src/components/widgets/FactsWidget.tsx
@@ -1,7 +1,7 @@
import React, { ReactElement } from 'react';
+import { useTranslation } from 'react-i18next';
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { useTranslation } from 'react-i18next';
import { TFactsWidgetOptions } from '../../store/types/widgets';
import { CaptionB, Title } from '../../styles/text';
import { getRandomFact } from '../../utils/widgets';
diff --git a/src/navigation/root/DrawerContent.tsx b/src/navigation/root/DrawerContent.tsx
index fb2a9168f..c0cce7410 100644
--- a/src/navigation/root/DrawerContent.tsx
+++ b/src/navigation/root/DrawerContent.tsx
@@ -8,10 +8,10 @@ import { useTranslation } from 'react-i18next';
import { StyleSheet, View } from 'react-native';
import AppStatus from '../../components/AppStatus';
-import GradientView from '../../components/GradientView';
import { useAppSelector } from '../../hooks/redux';
import { shopIntroSeenSelector } from '../../store/reselect/settings';
import colors from '../../styles/colors';
+import { View as ThemedView } from '../../styles/components';
import { Pressable } from '../../styles/components';
import {
ActivityIcon,
@@ -55,19 +55,19 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
const shopIntroSeen = useAppSelector(shopIntroSeenSelector);
return (
-
+
}
+ icon={}
label={t('drawer.wallet')}
testID="DrawerWallet"
onPress={() => navigation.navigate('Wallet')}
/>
}
+ icon={}
label={t('drawer.activity')}
testID="DrawerActivity"
onPress={() => {
@@ -75,25 +75,25 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
}}
/>
}
+ icon={}
label={t('drawer.contacts')}
testID="DrawerContacts"
onPress={() => navigation.navigate('Contacts')}
/>
}
+ icon={}
label={t('drawer.profile')}
testID="DrawerProfile"
onPress={() => navigation.navigate('Profile')}
/>
}
+ icon={}
label={t('drawer.widgets')}
testID="DrawerWidgets"
onPress={() => navigation.navigate('WidgetsSuggestions')}
/>
}
+ icon={}
label={t('drawer.shop')}
testID="DrawerShop"
onPress={() => {
@@ -105,7 +105,7 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
}}
/>
}
+ icon={}
label={t('drawer.settings')}
testID="DrawerSettings"
onPress={() => {
@@ -117,13 +117,14 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
style={styles.appStatus}
showText={true}
showReady={true}
+ color="black"
testID="DrawerAppStatus"
onPress={() => {
navigation.navigate('Settings', { screen: 'AppStatus' });
}}
/>
-
+
);
};
diff --git a/src/screens/Wallets/UnitButton.tsx b/src/screens/Wallets/UnitButton.tsx
index 0ab2464db..0af99dbc5 100644
--- a/src/screens/Wallets/UnitButton.tsx
+++ b/src/screens/Wallets/UnitButton.tsx
@@ -40,7 +40,7 @@ const UnitButton = ({
- {unit === EUnit.BTC ? 'BTC' : fiatTicker}
+ {unit === EUnit.BTC ? 'Bitcoin' : fiatTicker}
diff --git a/svgo.config.js b/svgo.config.js
index 106f95be4..cbaab30d0 100644
--- a/svgo.config.js
+++ b/svgo.config.js
@@ -3,6 +3,5 @@ module.exports = {
'preset-default',
'removeDimensions', // remove width and height attributes
'removeXMLNS', // remove xmlns attribute
- 'removeXlink', // remove xlink:href attribute
],
};