Skip to content

feat(ui): update design v56 #2546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pwltr merged 1 commit into from
May 29, 2025
Merged

feat(ui): update design v56 #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/icons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ export const unifiedCircleIcon = (color = 'white'): string => `
<svg viewBox="0 0 51 51"><rect width="50" height="50" y=".5" fill="#F40" rx="25"/><path fill="#B95CE8" d="M18.952 49.757 25 25.5l6.048-24.258c13.397 3.34 21.55 16.909 18.21 30.306-3.341 13.397-16.91 21.55-30.306 18.21Z"/><path fill="#fff" d="M34.322 22.248c.422-2.826-1.729-4.344-4.67-5.358l.954-3.827-2.33-.58-.928 3.726a95.447 95.447 0 0 0-1.867-.44l.935-3.75-2.327-.582-.955 3.827a78.014 78.014 0 0 1-1.488-.35l.002-.011-3.212-.802-.62 2.488s1.729.396 1.692.42c.944.236 1.114.86 1.085 1.356l-1.086 4.36c.065.017.149.04.242.078l-.246-.061-1.523 6.108c-.116.286-.409.717-1.068.553.024.034-1.694-.422-1.694-.422l-1.155 2.666 3.03.756c.564.141 1.117.289 1.661.428l-.963 3.872 2.326.58.955-3.83c.636.173 1.253.332 1.857.482l-.951 3.812 2.33.581.963-3.864c3.973.752 6.96.448 8.216-3.145 1.014-2.893-.05-4.562-2.14-5.65 1.522-.351 2.67-1.353 2.975-3.42ZM29 29.713c-.72 2.893-5.59 1.33-7.17.937l1.28-5.129c1.578.394 6.642 1.174 5.89 4.192Zm.72-7.507c-.657 2.632-4.71 1.295-6.026.967l1.16-4.651c1.315.328 5.55.94 4.866 3.684Z"/></svg>`;

export const unitBitcoinIcon = (color = 'white'): string => `
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="${color}" fill-opacity=".1" rx="16"/><path fill="${color}" d="M13.668 10.97V9h.873v1.97h-.873Zm1.99 0V9h.887v1.97h-.888ZM13.668 23v-1.97h.873V23h-.873Zm1.99 0v-1.97h.887V23h-.888ZM11.5 21.602V10.398h4.41c.808 0 1.483.123 2.026.369.543.245.95.584 1.22 1.015.277.431.415.927.415 1.489 0 .436-.089.82-.266 1.15a2.24 2.24 0 0 1-.71.812c-.296.21-.637.358-1.021.444v.113a2.513 2.513 0 0 1 2.078 1.293c.232.396.348.87.348 1.42 0 .592-.145 1.124-.436 1.595-.287.466-.71.834-1.273 1.105-.562.266-1.258.399-2.086.399H11.5Zm2.323-1.933h1.909c.646 0 1.117-.128 1.413-.383.3-.256.45-.594.45-1.015a1.508 1.508 0 0 0-.843-1.384c-.27-.135-.594-.203-.969-.203h-1.96v2.985Zm0-4.579h1.731c.32 0 .604-.057.85-.173.252-.115.45-.278.593-.488.143-.216.214-.472.214-.767 0-.401-.14-.725-.422-.97-.276-.25-.673-.376-1.19-.376h-1.776v2.774Z"/></svg>`;
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="#fff" fill-opacity=".1" rx="16"/><path fill="${color}" d="M13.668 10.97V9h.873v1.97h-.873Zm1.99 0V9h.887v1.97h-.888ZM13.668 23v-1.97h.873V23h-.873Zm1.99 0v-1.97h.887V23h-.888ZM11.5 21.602V10.398h4.41c.808 0 1.483.123 2.026.369.543.245.95.584 1.22 1.015.277.431.415.927.415 1.489 0 .436-.089.82-.266 1.15a2.24 2.24 0 0 1-.71.812c-.296.21-.637.358-1.021.444v.113a2.513 2.513 0 0 1 2.078 1.293c.232.396.348.87.348 1.42 0 .592-.145 1.124-.436 1.595-.287.466-.71.834-1.273 1.105-.562.266-1.258.399-2.086.399H11.5Zm2.323-1.933h1.909c.646 0 1.117-.128 1.413-.383.3-.256.45-.594.45-1.015a1.508 1.508 0 0 0-.843-1.384c-.27-.135-.594-.203-.969-.203h-1.96v2.985Zm0-4.579h1.731c.32 0 .604-.057.85-.173.252-.115.45-.278.593-.488.143-.216.214-.472.214-.767 0-.401-.14-.725-.422-.97-.276-.25-.673-.376-1.19-.376h-1.776v2.774Z"/></svg>`;

export const unitFiatIcon = (color = 'white'): string => `
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="#fff" fill-opacity=".1" rx="16"/><g fill="${color}"><path d="M16 22a6 6 0 1 0 0-12 6 6 0 0 0 0 12z" opacity=".2"/><path fill-rule="evenodd" d="M16 10.5a5.5 5.5 0 1 0 0 11 5.5 5.5 0 0 0 0-11zM9.5 16a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M9.842 14a.5.5 0 0 1 .5-.5h11.316a.5.5 0 0 1 0 1H10.342a.5.5 0 0 1-.5-.5zM9.842 18a.5.5 0 0 1 .5-.5h11.316a.5.5 0 0 1 0 1H10.342a.5.5 0 0 1-.5-.5z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M14.692 12.068c-.42.98-.692 2.37-.692 3.932 0 1.561.272 2.951.692 3.932.21.491.448.857.686 1.092.237.234.446.315.622.315s.386-.081.622-.315c.238-.235.476-.6.686-1.092.42-.98.692-2.37.692-3.932 0-1.561-.272-2.951-.692-3.932-.21-.491-.448-.857-.686-1.092-.236-.234-.446-.315-.622-.315s-.386.081-.622.315c-.238.235-.476.6-.686 1.092zm-.016-1.804c.361-.357.81-.603 1.324-.603s.963.246 1.325.603c.36.356.66.845.902 1.41.485 1.133.773 2.663.773 4.326s-.288 3.193-.773 4.326c-.242.565-.543 1.054-.903 1.41-.361.357-.81.603-1.324.603s-.963-.246-1.325-.603c-.36-.356-.66-.845-.902-1.41C13.288 19.193 13 17.663 13 16s.288-3.193.773-4.326c.242-.565.543-1.054.902-1.41z" clip-rule="evenodd"/></g></svg>`;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/svgs/raw/unitBitcoin.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions src/components/AppStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -99,7 +104,7 @@ const AppStatus = ({
return 'red';
};

const color = appStatusColor();
const color = overrideColor || appStatusColor();

if (appStatus === 'ready' && !showReady) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/CalculatorWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const CalculatorWidget = ({
}}
/>
</View>
<CaptionB color="gray1">BTC</CaptionB>
<CaptionB color="gray1">BITCOIN</CaptionB>
</ThemedView>
<ThemedView style={styles.row} color="white06">
<ThemedView style={styles.icon} color="white10">
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/FactsWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
21 changes: 11 additions & 10 deletions src/navigation/root/DrawerContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -55,45 +55,45 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
const shopIntroSeen = useAppSelector(shopIntroSeenSelector);

return (
<GradientView style={[styles.drawer]}>
<ThemedView style={[styles.drawer]} color="brand">
<DrawerContentScrollView
contentContainerStyle={styles.drawerContent}
bounces={false}
{...props}>
<DrawerItem
icon={<CoinsIcon color="brand" width={24} height={24} />}
icon={<CoinsIcon color="white" width={24} height={24} />}
label={t('drawer.wallet')}
testID="DrawerWallet"
onPress={() => navigation.navigate('Wallet')}
/>
<DrawerItem
icon={<ActivityIcon color="brand" width={24} height={24} />}
icon={<ActivityIcon color="white" width={24} height={24} />}
label={t('drawer.activity')}
testID="DrawerActivity"
onPress={() => {
navigation.navigate('Wallet', { screen: 'ActivityFiltered' });
}}
/>
<DrawerItem
icon={<UsersIcon color="brand" width={24} height={24} />}
icon={<UsersIcon color="white" width={24} height={24} />}
label={t('drawer.contacts')}
testID="DrawerContacts"
onPress={() => navigation.navigate('Contacts')}
/>
<DrawerItem
icon={<UserSquareIcon color="brand" width={24} height={24} />}
icon={<UserSquareIcon color="white" width={24} height={24} />}
label={t('drawer.profile')}
testID="DrawerProfile"
onPress={() => navigation.navigate('Profile')}
/>
<DrawerItem
icon={<StackIcon color="brand" width={24} height={24} />}
icon={<StackIcon color="white" width={24} height={24} />}
label={t('drawer.widgets')}
testID="DrawerWidgets"
onPress={() => navigation.navigate('WidgetsSuggestions')}
/>
<DrawerItem
icon={<StorefrontIcon color="brand" width={24} height={24} />}
icon={<StorefrontIcon color="white" width={24} height={24} />}
label={t('drawer.shop')}
testID="DrawerShop"
onPress={() => {
Expand All @@ -105,7 +105,7 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
}}
/>
<DrawerItem
icon={<SettingsIcon color="brand" width={24} height={24} />}
icon={<SettingsIcon color="white" width={24} height={24} />}
label={t('drawer.settings')}
testID="DrawerSettings"
onPress={() => {
Expand All @@ -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' });
}}
/>
</DrawerContentScrollView>
</GradientView>
</ThemedView>
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/screens/Wallets/UnitButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const UnitButton = ({
<View style={styles.container}>
<SwitchIcon color={color} width={16.44} height={13.22} />
<Caption13Up style={styles.text} color={color}>
{unit === EUnit.BTC ? 'BTC' : fiatTicker}
{unit === EUnit.BTC ? 'Bitcoin' : fiatTicker}
</Caption13Up>
</View>
</TouchableHighlight>
Expand Down
1 change: 0 additions & 1 deletion svgo.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ module.exports = {
'preset-default',
'removeDimensions', // remove width and height attributes
'removeXMLNS', // remove xmlns attribute
'removeXlink', // remove xlink:href attribute
],
};
Loading