From d18b14d0c03bf09b8179dc66914840cac17df036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Sun, 25 Feb 2024 18:16:19 -0300 Subject: [PATCH 01/52] remove unused colors --- src/screens/createKeys/new/index.ts | 1 - src/screens/createKeys/new/styles.ts | 59 ---------------------------- src/shared/constants/index.ts | 6 +-- src/styles/colors.ts | 41 +++++-------------- 4 files changed, 12 insertions(+), 95 deletions(-) delete mode 100644 src/screens/createKeys/new/styles.ts diff --git a/src/screens/createKeys/new/index.ts b/src/screens/createKeys/new/index.ts index 884ad51b3..c1d324121 100644 --- a/src/screens/createKeys/new/index.ts +++ b/src/screens/createKeys/new/index.ts @@ -1,3 +1,2 @@ export * from './ConfirmNewMasterKeyScreen' export * from './NewMasterKeyScreen' -export * from './styles' diff --git a/src/screens/createKeys/new/styles.ts b/src/screens/createKeys/new/styles.ts deleted file mode 100644 index 0f776dc55..000000000 --- a/src/screens/createKeys/new/styles.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { StyleSheet } from 'react-native' - -import { grid } from '../../../styles' -import { colors } from '../../../styles/colors' - -export const sharedMnemonicStyles = StyleSheet.create({ - parent: { - backgroundColor: colors.darkBlue, - flexDirection: 'row', - }, - purpleParent: { - backgroundColor: colors.blue, - flexDirection: 'row', - }, - topContent: { - flexDirection: 'column', - }, - sliderContainer: { - flex: 5, - }, - pagnationContainer: { - flexDirection: 'column', - marginBottom: 50, - }, - wordContainer: { - marginTop: 10, - borderRadius: 10, - }, - wordRow: { - ...grid.row, - backgroundColor: colors.blue, - borderRadius: 10, - padding: 15, - }, - wordNumberBadge: { - backgroundColor: colors.darkBlue, - borderRadius: 20, - width: 40, - height: 40, - }, - wordNumberBadgeText: { - textAlign: 'center', - color: colors.white, - fontSize: 20, - paddingTop: 7, - }, - suggestionRow: { - borderBottomRightRadius: 20, - borderBottomLeftRadius: 20, - backgroundColor: colors.blue2, - }, - // used for displaying the mnemonic and the suggestions - wordText: { - color: colors.white, - fontSize: 17, - marginLeft: 10, - paddingTop: 8, - }, -}) diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index c2c90f7f5..a81735edb 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -31,12 +31,12 @@ export const sharedColors = { primaryDark: '#4250CC', labelLight: '#B8B8B8', subTitle: '#FBFBFB', - tokenBackground: '#1E1E1E', + // tokenBackground: '#1E1E1E', black: '#000000', qrColor: '#DBE3FF', errorBackground: '#FF3559', - lightPurple: '#DAE2FF', - blue: '#6053F8', + // lightPurple: '#DAE2FF', + // blue: '#6053F8', } export const tokenColors = { diff --git a/src/styles/colors.ts b/src/styles/colors.ts index 02c0a82f0..db368b62c 100644 --- a/src/styles/colors.ts +++ b/src/styles/colors.ts @@ -1,57 +1,34 @@ export const colors = { white: '#FFFFFF', lightPurple: '#DAE2FF', // #DBE3FF - transparentWhite: 'rgba(218,226,255,.15)', - purple: '#A2A3E5', - darkPurple: '#74709B', - darkPurple2: '#514F78', darkPurple3: '#050134', - darkPurple4: '#191446', darkPurple5: '#252352', - blue: '#6053F8', - blue2: '#222071', - darkBlue: '#002653', // #050134 - lightBlue: '#0086ff', - green: '#71F5AE', orange: '#F89F84', gray: '#707070', - darkGray: '#666', - black: '#000000', red: '#F89F84', lightGray: '#c7cfec', - none: 'rgba(0, 0, 0, 0)', - text: { - primary: '#dbe3ff', - secondary: '#9ca1c3', + // primary: '#dbe3ff', + // secondary: '#9ca1c3', }, // PALETTE background: { - button: '#050033', - light: '#dbe3ff', - primary: '#1a1849', + // primary: '#1a1849', secondary: '#2d2d6c', - gray: '#dbe3ff', - lightSteelBlue: '#B8C1E3', - darkBlue: '#020034', - blue: '#381BE1', - blue2: '#3F06D3', - purple: '#624FE9', bustyBlue: '#4200D8', - black: '#121212', }, border: { - green: '#00d8a6', - red: '#b02f47', + // green: '#00d8a6', + // red: '#b02f47', }, button: { - primary: '#3901BD', - primaryPressed: '#4918C3', - secondary: '#020034', - secondaryPressed: '#DBE3FF', + // primary: '#3901BD', + // primaryPressed: '#4918C3', + // secondary: '#020034', + // secondaryPressed: '#DBE3FF', }, } From a84e30012878015024491649333e9f526ad16026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Sun, 25 Feb 2024 18:28:00 -0300 Subject: [PATCH 02/52] add primary and secondary colors for text --- src/components/button/index.tsx | 3 ++- src/screens/createKeys/CreateKeysScreen.tsx | 5 +++-- src/styles/colors.ts | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index 8a1d2934a..c641b4d27 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -18,6 +18,7 @@ import { castStyle } from 'shared/utils' import { AccessibilityLabelStandards } from '../shared' import { AppSpinner } from '../spinner' +import { colors } from 'src/styles' export const buttonHeight = 52 const defaultPadding = 14 @@ -106,7 +107,7 @@ export const AppButton = ({ accessibilityLabel = '', onPress, color = sharedColors.inputInactive, - textColor = sharedColors.white, + textColor = colors.text.primary, textType = 'button1', backgroundVariety = AppButtonBackgroundVarietyEnum.DEFAULT, widthVariety = AppButtonWidthVarietyEnum.FULL, diff --git a/src/screens/createKeys/CreateKeysScreen.tsx b/src/screens/createKeys/CreateKeysScreen.tsx index 595ee3c07..39aea43ec 100644 --- a/src/screens/createKeys/CreateKeysScreen.tsx +++ b/src/screens/createKeys/CreateKeysScreen.tsx @@ -13,6 +13,7 @@ import { } from 'navigation/createKeysNavigator' import { WINDOW_HEIGHT, sharedColors } from 'shared/constants' import { castStyle } from 'shared/utils' +import { colors } from 'src/styles' export const CreateKeysScreen = ({ navigation, @@ -46,7 +47,7 @@ export const CreateKeysScreen = ({ accessibilityLabel={'newWallet'} title={t('initial_screen_button_create')} color={sharedColors.white} - textColor={sharedColors.black} + textColor={colors.text.secondary} /> Date: Sun, 25 Feb 2024 18:37:17 -0300 Subject: [PATCH 03/52] add colors text in security information screen --- src/components/typography/index.tsx | 4 ++-- src/screens/createKeys/SecurityInformation.tsx | 17 +++++++++-------- src/styles/colors.ts | 2 ++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/components/typography/index.tsx b/src/components/typography/index.tsx index 7ec127f42..356c85dee 100644 --- a/src/components/typography/index.tsx +++ b/src/components/typography/index.tsx @@ -1,13 +1,13 @@ import { ColorValue, StyleSheet, Text, TextProps } from 'react-native' -import { sharedColors } from 'shared/constants' import { castStyle } from 'shared/utils' +import { colors } from 'src/styles' export const fonts = StyleSheet.create({ regular: castStyle.text({ fontFamily: 'Sora-Regular', fontWeight: '500', - color: sharedColors.white, + color: colors.text.primary, }), }) diff --git a/src/screens/createKeys/SecurityInformation.tsx b/src/screens/createKeys/SecurityInformation.tsx index a49666e9b..c3ffdadcd 100644 --- a/src/screens/createKeys/SecurityInformation.tsx +++ b/src/screens/createKeys/SecurityInformation.tsx @@ -1,19 +1,20 @@ +import config from 'config.json' import { useCallback, useState } from 'react' -import { Linking, StyleSheet, View } from 'react-native' import { useTranslation } from 'react-i18next' -import { useSafeAreaInsets } from 'react-native-safe-area-context' +import { Linking, StyleSheet, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' -import config from 'config.json' +import { useSafeAreaInsets } from 'react-native-safe-area-context' +import { Checkbox } from 'components/checkbox' +import { AppButton, AppTouchable, Typography } from 'components/index' import { createKeysRouteNames, CreateKeysScreenProps, } from 'navigation/createKeysNavigator/types' import { sharedColors, sharedStyles } from 'shared/constants' import { castStyle } from 'shared/utils' -import { AppButton, AppTouchable, Typography } from 'components/index' -import { Checkbox } from 'components/checkbox' import { SETTINGS } from 'src/core/types' +import { colors } from 'src/styles' enum TestID { IAgreeCheckbox = 'Checkbox.IAgreeCheckbox', @@ -91,7 +92,7 @@ export const SecurityInformation = ({ title={t('security_info_btn')} disabled={!isCheckboxActive} color={sharedColors.white} - textColor={sharedColors.black} + textColor={colors.text.secondary} accessibilityLabel={TestID.ContinueButton} /> @@ -120,14 +121,14 @@ const styles = StyleSheet.create({ marginTop: 22, textAlign: 'center', lineHeight: 18, - color: sharedColors.labelLight, + color: colors.text.label, }), termsAndConditionsView: castStyle.view({ alignSelf: 'center', marginBottom: 22, }), termsAndConditionsText: castStyle.text({ - color: 'blue', + color: colors.text.link, textDecorationLine: 'underline', }), agreementView: castStyle.view({ flexDirection: 'row', alignSelf: 'center' }), diff --git a/src/styles/colors.ts b/src/styles/colors.ts index 36dc1d473..f576ca7d5 100644 --- a/src/styles/colors.ts +++ b/src/styles/colors.ts @@ -14,6 +14,8 @@ export const colors = { text: { primary: '#fff', secondary: '#000', + label: '#B8B8B8', + link: '#4152E6', }, // PALETTE background: { From 87798d8f53abef3cd6ccd69fe1839feb062d65d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Sun, 25 Feb 2024 18:41:32 -0300 Subject: [PATCH 04/52] move colors text to sharedColors --- src/components/button/index.tsx | 3 +-- src/components/typography/index.tsx | 4 ++-- src/screens/createKeys/CreateKeysScreen.tsx | 5 ++--- src/screens/createKeys/SecurityInformation.tsx | 7 +++---- src/shared/constants/index.ts | 7 +++++++ src/styles/colors.ts | 6 ------ 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index c641b4d27..090e3fe49 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -18,7 +18,6 @@ import { castStyle } from 'shared/utils' import { AccessibilityLabelStandards } from '../shared' import { AppSpinner } from '../spinner' -import { colors } from 'src/styles' export const buttonHeight = 52 const defaultPadding = 14 @@ -107,7 +106,7 @@ export const AppButton = ({ accessibilityLabel = '', onPress, color = sharedColors.inputInactive, - textColor = colors.text.primary, + textColor = sharedColors.text.primary, textType = 'button1', backgroundVariety = AppButtonBackgroundVarietyEnum.DEFAULT, widthVariety = AppButtonWidthVarietyEnum.FULL, diff --git a/src/components/typography/index.tsx b/src/components/typography/index.tsx index 356c85dee..8fb064da9 100644 --- a/src/components/typography/index.tsx +++ b/src/components/typography/index.tsx @@ -1,13 +1,13 @@ import { ColorValue, StyleSheet, Text, TextProps } from 'react-native' +import { sharedColors } from 'shared/constants' import { castStyle } from 'shared/utils' -import { colors } from 'src/styles' export const fonts = StyleSheet.create({ regular: castStyle.text({ fontFamily: 'Sora-Regular', fontWeight: '500', - color: colors.text.primary, + color: sharedColors.text.primary, }), }) diff --git a/src/screens/createKeys/CreateKeysScreen.tsx b/src/screens/createKeys/CreateKeysScreen.tsx index 39aea43ec..890c31247 100644 --- a/src/screens/createKeys/CreateKeysScreen.tsx +++ b/src/screens/createKeys/CreateKeysScreen.tsx @@ -13,7 +13,6 @@ import { } from 'navigation/createKeysNavigator' import { WINDOW_HEIGHT, sharedColors } from 'shared/constants' import { castStyle } from 'shared/utils' -import { colors } from 'src/styles' export const CreateKeysScreen = ({ navigation, @@ -47,7 +46,7 @@ export const CreateKeysScreen = ({ accessibilityLabel={'newWallet'} title={t('initial_screen_button_create')} color={sharedColors.white} - textColor={colors.text.secondary} + textColor={sharedColors.text.secondary} /> @@ -121,14 +120,14 @@ const styles = StyleSheet.create({ marginTop: 22, textAlign: 'center', lineHeight: 18, - color: colors.text.label, + color: sharedColors.text.label, }), termsAndConditionsView: castStyle.view({ alignSelf: 'center', marginBottom: 22, }), termsAndConditionsText: castStyle.text({ - color: colors.text.link, + color: sharedColors.text.link, textDecorationLine: 'underline', }), agreementView: castStyle.view({ flexDirection: 'row', alignSelf: 'center' }), diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index a81735edb..253cf24dd 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -37,6 +37,13 @@ export const sharedColors = { errorBackground: '#FF3559', // lightPurple: '#DAE2FF', // blue: '#6053F8', + + text: { + primary: '#fff', + secondary: '#000', + label: '#B8B8B8', + link: '#4152E6', + }, } export const tokenColors = { diff --git a/src/styles/colors.ts b/src/styles/colors.ts index f576ca7d5..d0fa45be0 100644 --- a/src/styles/colors.ts +++ b/src/styles/colors.ts @@ -11,12 +11,6 @@ export const colors = { red: '#F89F84', lightGray: '#c7cfec', - text: { - primary: '#fff', - secondary: '#000', - label: '#B8B8B8', - link: '#4152E6', - }, // PALETTE background: { primary: '#000', From 99aaf2c25ad484bc4d7662b558e69c6a576d7a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Sun, 25 Feb 2024 19:23:36 -0300 Subject: [PATCH 05/52] refactor colors --- src/components/icons/EyeIcon.tsx | 2 +- src/components/mnemonic/index.tsx | 2 +- src/components/modal/index.tsx | 6 ++---- src/components/token/index.tsx | 2 +- src/lib/i18n.ts | 2 +- src/screens/createKeys/SecurityInformation.tsx | 2 +- .../createKeys/import/ImportMasterKeyScreen.tsx | 2 +- src/screens/createKeys/new/NewMasterKeyScreen.tsx | 13 +++++++------ src/shared/constants/index.ts | 14 ++++++++++++-- 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/components/icons/EyeIcon.tsx b/src/components/icons/EyeIcon.tsx index 6567b81b9..00dbbc3bc 100644 --- a/src/components/icons/EyeIcon.tsx +++ b/src/components/icons/EyeIcon.tsx @@ -11,7 +11,7 @@ interface Props extends Omit { export const EyeIcon = ({ isHidden, size = defaultIconSize, - color = sharedColors.white, + color = sharedColors.text.primary, }: Props) => { return ( diff --git a/src/components/mnemonic/index.tsx b/src/components/mnemonic/index.tsx index f25b91d5e..fd56445d1 100644 --- a/src/components/mnemonic/index.tsx +++ b/src/components/mnemonic/index.tsx @@ -118,7 +118,7 @@ const styles = StyleSheet.create({ width: '100%', minHeight: 309, justifyContent: 'center', - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, padding: 20, borderRadius: 10, }), diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index 2921f5f99..337df19eb 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -91,7 +91,7 @@ export const ConfirmationModal = ({ title, titleColor, description = '', - descriptionColor, + descriptionColor = sharedColors.labelLight, okText = 'OK', cancelText, onOk, @@ -118,9 +118,7 @@ export const ConfirmationModal = ({ {description && ( {description} diff --git a/src/components/token/index.tsx b/src/components/token/index.tsx index 87a133839..2906ae97b 100644 --- a/src/components/token/index.tsx +++ b/src/components/token/index.tsx @@ -181,7 +181,7 @@ export const TokenBalance = ({ onPress={onHide} accessibilityLabel={testIDs.hide}> - + )} diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts index b01da955f..b01dde318 100644 --- a/src/lib/i18n.ts +++ b/src/lib/i18n.ts @@ -127,7 +127,7 @@ const resources = { mnemonic_body_copy: 'We strongly recommend you to write the phrase also on a piece of paper.', new_master_key_title: 'Save your phrase', - new_master_key_button_title: 'Phrase secured, Continue', + new_master_key_button_title: 'Phrase secured, continue', new_master_key_secure_later_button: 'Secure later', change_asset: 'Change asset', loading_qr: 'Loading QR', diff --git a/src/screens/createKeys/SecurityInformation.tsx b/src/screens/createKeys/SecurityInformation.tsx index 2e259d6be..949657c0a 100644 --- a/src/screens/createKeys/SecurityInformation.tsx +++ b/src/screens/createKeys/SecurityInformation.tsx @@ -111,7 +111,7 @@ const styles = StyleSheet.create({ }), userAgreementBox: castStyle.view({ marginTop: 29, - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, paddingVertical: 48, paddingHorizontal: 40, }), diff --git a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx index 88a53efdb..5806605ee 100644 --- a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx +++ b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx @@ -280,7 +280,7 @@ export const ImportMasterKeyScreen = ( accessibilityLabel={'OK'} title={t('ok')} color={sharedColors.white} - textColor={sharedColors.black} + textColor={sharedColors.text.secondary} textType={'body2'} textStyle={sharedStyles.fontBoldText} onPress={handleImportMnemonic} diff --git a/src/screens/createKeys/new/NewMasterKeyScreen.tsx b/src/screens/createKeys/new/NewMasterKeyScreen.tsx index a4ccec978..45538d1ff 100644 --- a/src/screens/createKeys/new/NewMasterKeyScreen.tsx +++ b/src/screens/createKeys/new/NewMasterKeyScreen.tsx @@ -58,7 +58,7 @@ export const NewMasterKeyScreen = ({ navigation }: Props) => { { title={t('new_master_key_button_title')} disabled={!isMnemonicVisible} color={sharedColors.white} - textColor={sharedColors.black} + textColor={sharedColors.text.secondary} textType={'h4'} onPress={() => navigation.navigate(createKeysRouteNames.ConfirmNewMasterKey, { @@ -87,8 +87,7 @@ export const NewMasterKeyScreen = ({ navigation }: Props) => { { const styles = StyleSheet.create({ screen: castStyle.view({ flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, paddingHorizontal: 24, }), titleText: castStyle.text({ @@ -117,5 +116,7 @@ const styles = StyleSheet.create({ left: 24, right: 24, }), - secureLaterBtn: castStyle.view({ marginTop: 8 }), + secureLaterBtn: castStyle.view({ + marginTop: 8, + }), }) diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 253cf24dd..5cf076430 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -1,4 +1,4 @@ -import { StyleSheet, Dimensions } from 'react-native' +import { Dimensions, StyleSheet } from 'react-native' import { castStyle } from '../utils' @@ -38,12 +38,22 @@ export const sharedColors = { // lightPurple: '#DAE2FF', // blue: '#6053F8', + background: { + primary: '#000', + secondary: '#252525', + }, + text: { primary: '#fff', secondary: '#000', label: '#B8B8B8', link: '#4152E6', }, + + stepper: { + active: '#4B5CF0', + inactive: '#3A3A3A', + }, } export const tokenColors = { @@ -97,7 +107,7 @@ export const sharedStyles = StyleSheet.create({ }), screen: castStyle.view({ flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, paddingHorizontal: 24, }), noPadding: castStyle.view({ padding: 0 }), From 1a91c124bf7e99d772aa30c881568922a3e9ee83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Sun, 25 Feb 2024 21:03:35 -0300 Subject: [PATCH 06/52] footer active color of buttons --- src/components/icons/HomeIcon.tsx | 10 ++++++++-- src/components/icons/NetworkIcon.tsx | 10 ++++++++-- src/components/icons/ScanIcon.tsx | 10 ++++++++-- src/components/icons/TransactionsIcon.tsx | 5 ++++- src/components/icons/UsersIcon.tsx | 10 ++++++++-- src/components/icons/index.tsx | 1 + src/components/modal/deleteWalletModal/index.tsx | 6 +++--- src/components/modal/index.tsx | 12 ++++++------ src/shared/constants/index.ts | 2 +- src/ux/appFooter/index.tsx | 12 ++++++------ 10 files changed, 53 insertions(+), 25 deletions(-) diff --git a/src/components/icons/HomeIcon.tsx b/src/components/icons/HomeIcon.tsx index e790581bb..58cddf433 100644 --- a/src/components/icons/HomeIcon.tsx +++ b/src/components/icons/HomeIcon.tsx @@ -1,10 +1,16 @@ import Svg, { Path, Rect } from 'react-native-svg' +import { sharedColors } from 'shared/constants' + import { FooterIconInterface } from '.' -const HomeIcon = ({ active = false, ...props }: FooterIconInterface) => ( +const HomeIcon = ({ + active = false, + activeColor = sharedColors.primary, + ...props +}: FooterIconInterface) => ( - {active && } + {active && } ( +const NetworkIcon = ({ + active = false, + activeColor = sharedColors.primary, + ...props +}: FooterIconInterface) => ( - {active && } + {active && } { +export const ScanIcon = ({ + active = false, + activeColor = sharedColors.primary, + ...props +}: FooterIconInterface) => { return ( - {active && } + {active && } ( - {active && } + {active && } ( +const UsersIcon = ({ + active = false, + activeColor = sharedColors.primary, + ...props +}: FooterIconInterface) => ( - {active && } + {active && } { createDeleteConfirmationConfigFn: () => ConfirmationModalConfig, ): ConfirmationModalConfig => { return { - color: sharedColors.dangerLight, + backgroundColor: sharedColors.dangerLight, title: t( 'wallet_backup_definitive_delete_confirmation_title', ) as string, @@ -54,7 +54,7 @@ export const DeleteWalletModal = ({ isVisible, setVisible }: Props) => { const createDeleteConfirmationConfig = useCallback((): ConfirmationModalConfig => { return { - color: sharedColors.dangerLight, + backgroundColor: sharedColors.dangerLight, title: t('wallet_backup_delete_confirmation_title') as string, titleColor: sharedColors.black, description: t( @@ -86,7 +86,7 @@ export const DeleteWalletModal = ({ isVisible, setVisible }: Props) => { return ( void titleColor?: ColorValue buttons?: [ConfirmationModalButtonConfig, ConfirmationModalButtonConfig] - color?: ColorValue + backgroundColor?: ColorValue imgSource?: ImageSourcePropType description?: string descriptionColor?: ColorValue @@ -89,22 +89,22 @@ export type ConfirmationModalConfig = Omit export const ConfirmationModal = ({ isVisible = true, title, - titleColor, + titleColor = sharedColors.text.primary, description = '', - descriptionColor = sharedColors.labelLight, + descriptionColor = sharedColors.text.label, + backgroundColor = sharedColors.primary, okText = 'OK', cancelText, onOk, onCancel, imgSource, - color, buttons, }: ConfirmationModalProps) => ( @@ -112,7 +112,7 @@ export const ConfirmationModal = ({ + color={titleColor}> {title} {description && ( diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 5cf076430..2c28ea3dd 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -16,6 +16,7 @@ export const testIDs = { export const sharedColors = { primary: '#4B5CF0', + primaryDark: '#4250CC', // used over the primary color secondary: '#121212', success: '#79C600', successLight: '#59FF9C', @@ -28,7 +29,6 @@ export const sharedColors = { inputActive: '#3A3A3A', inputLabelColor: '#B8B8B8', borderColor: '#575757', - primaryDark: '#4250CC', labelLight: '#B8B8B8', subTitle: '#FBFBFB', // tokenBackground: '#1E1E1E', diff --git a/src/ux/appFooter/index.tsx b/src/ux/appFooter/index.tsx index 8c67cf5e4..a5fcd8065 100644 --- a/src/ux/appFooter/index.tsx +++ b/src/ux/appFooter/index.tsx @@ -7,11 +7,11 @@ import { homeStackRouteNames } from 'navigation/homeNavigator/types' import { rootTabsRouteNames } from 'navigation/rootNavigator' import { sharedColors, sharedStyles } from 'shared/constants' import { castStyle } from 'shared/utils' -import HomeIcon from 'src/components/icons/HomeIcon' -import NetworkIcon from 'src/components/icons/NetworkIcon' -import { ScanIcon } from 'src/components/icons/ScanIcon' -import TransactionsIcon from 'src/components/icons/TransactionsIcon' -import UsersIcon from 'src/components/icons/UsersIcon' +import HomeIcon from 'components/icons/HomeIcon' +import NetworkIcon from 'components/icons/NetworkIcon' +import { ScanIcon } from 'components/icons/ScanIcon' +import TransactionsIcon from 'components/icons/TransactionsIcon' +import UsersIcon from 'components/icons/UsersIcon' const buttonWidth = 52 @@ -81,7 +81,7 @@ const styles = StyleSheet.create({ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, }), walletIcon: { height: 20, From 8eb30164f94a4f5a71b7fb0c201b302f72b8278c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 27 Feb 2024 01:18:23 -0300 Subject: [PATCH 07/52] home page --- src/components/Porfolio/PortfolioCard.tsx | 8 +++---- src/components/token/index.tsx | 2 +- src/screens/home/HomeInformationBar.tsx | 4 ++-- src/screens/home/PortfolioComponent.tsx | 6 +++--- src/screens/home/index.tsx | 26 +++++++++++------------ src/screens/home/tokenColor.ts | 2 +- src/shared/constants/index.ts | 2 ++ 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/components/Porfolio/PortfolioCard.tsx b/src/components/Porfolio/PortfolioCard.tsx index 997c40dfe..2cfac939d 100644 --- a/src/components/Porfolio/PortfolioCard.tsx +++ b/src/components/Porfolio/PortfolioCard.tsx @@ -134,7 +134,7 @@ const styles = StyleSheet.create({ borderRadius: 10, margin: 5, padding: 12, - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, }, }) @@ -152,7 +152,7 @@ const selectedCardStyles = StyleSheet.create({ width: 20, }), primaryText: castStyle.text({ - color: sharedColors.white, + color: sharedColors.text.primary, fontSize: 22, paddingTop: 3, }), @@ -179,11 +179,11 @@ const nonSelectedCardStyles = StyleSheet.create({ marginRight: 3, }), primaryText: castStyle.text({ - color: sharedColors.white, + color: sharedColors.text.primary, fontSize: 16, }), secondaryText: castStyle.text({ - color: sharedColors.white, + color: sharedColors.text.primary, fontSize: 16, right: 0, }), diff --git a/src/components/token/index.tsx b/src/components/token/index.tsx index 2906ae97b..accd32570 100644 --- a/src/components/token/index.tsx +++ b/src/components/token/index.tsx @@ -52,7 +52,7 @@ enum TestID { export const TokenBalance = ({ firstValue, secondValue, - color = sharedColors.black, + color = sharedColors.background.primary, hide = false, editable = false, error, diff --git a/src/screens/home/HomeInformationBar.tsx b/src/screens/home/HomeInformationBar.tsx index d6b4ed663..2bd6c491c 100644 --- a/src/screens/home/HomeInformationBar.tsx +++ b/src/screens/home/HomeInformationBar.tsx @@ -49,7 +49,7 @@ export const HomeInformationBar = ({ } />, @@ -83,7 +83,7 @@ export const HomeInformationBar = ({ ({ @@ -155,9 +155,9 @@ export const HomeScreen = ({ useEffect(() => { if (isFocused) { - dispatch(changeTopColor(selectedColor)) + dispatch(changeTopColor(backgroundColor)) } - }, [selectedColor, dispatch, isFocused]) + }, [dispatch, isFocused, backgroundColor]) const selectedToken = useMemo(() => { if (selected) { @@ -225,12 +225,12 @@ export const HomeScreen = ({ hideable={true} hide={hideBalance} onHide={() => dispatch(setHideBalance(!hideBalance))} - color={backgroundColor.backgroundColor} + color={backgroundColor} /> {showInfoBar && !closed && } @@ -280,6 +280,10 @@ export const HomeScreen = ({ } const styles = StyleSheet.create({ + container: castStyle.view({ + flex: 1, + backgroundColor: sharedColors.background.primary, + }), bodyContainer: castStyle.view({ padding: 12, }), @@ -294,18 +298,14 @@ const styles = StyleSheet.create({ portfolioLabel: castStyle.text({ padding: 6, paddingTop: 10, - color: sharedColors.inputLabelColor, + color: sharedColors.text.label, }), transactionItem: castStyle.view({ paddingHorizontal: 6, }), transactionsLabel: castStyle.text({ padding: 6, - color: sharedColors.inputLabelColor, - }), - container: castStyle.view({ - flex: 1, - backgroundColor: sharedColors.black, + color: sharedColors.text.label, }), text: castStyle.text({ textAlign: 'center', diff --git a/src/screens/home/tokenColor.ts b/src/screens/home/tokenColor.ts index 32fd04876..550f51798 100644 --- a/src/screens/home/tokenColor.ts +++ b/src/screens/home/tokenColor.ts @@ -15,7 +15,7 @@ export const getTokenColor = (tokenSymbol: string): string => { case 'BTCT': return tokenColors.btc default: - return sharedColors.borderColor + return sharedColors.background.accent } } diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 2c28ea3dd..da1f9f40b 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -41,6 +41,8 @@ export const sharedColors = { background: { primary: '#000', secondary: '#252525', + accent: '#575757', + highlight: '#B8B8B8', }, text: { From f01141049fce4733ec1767e7b2a0aa459e9a9d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 27 Feb 2024 01:34:39 -0300 Subject: [PATCH 08/52] pin screen --- src/navigation/index.tsx | 2 +- src/screens/pinScreen/index.tsx | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/navigation/index.tsx b/src/navigation/index.tsx index 7572bfe8d..b09248c8e 100644 --- a/src/navigation/index.tsx +++ b/src/navigation/index.tsx @@ -55,7 +55,7 @@ export const screenOptionsWithHeader = ( ), headerStyle: { height: 64 + topInset, - backgroundColor: color ?? sharedColors.black, + backgroundColor: color || sharedColors.background.primary, }, headerShadowVisible: false, } diff --git a/src/screens/pinScreen/index.tsx b/src/screens/pinScreen/index.tsx index 9758ce535..43235e2e3 100644 --- a/src/screens/pinScreen/index.tsx +++ b/src/screens/pinScreen/index.tsx @@ -125,7 +125,7 @@ type Props = export const PinScreen = ({ navigation, route }: Props) => { const initializeWallet = useInitializeWallet() const setGlobalError = useSetGlobalError() - const insets = useSafeAreaInsets() + const { top } = useSafeAreaInsets() const isFocused = useIsFocused() // const isVisible = useKeyboardIsVisible() const { t } = useTranslation() @@ -360,7 +360,7 @@ export const PinScreen = ({ navigation, route }: Props) => { navigation.setOptions( screenOptionsWithHeader( - insets.top, + top, headerTitle, undefined, steps ?? undefined, @@ -370,7 +370,7 @@ export const PinScreen = ({ navigation, route }: Props) => { ) }, [ navigation, - insets, + top, steps, backScreen, headerTitle, @@ -440,7 +440,7 @@ export const PinScreen = ({ navigation, route }: Props) => { ]} onPress={focusInput} title={t('pin_settings_open_keyboard_btn')} - textColor={sharedColors.white} + textColor={sharedColors.text.primary} backgroundVariety={AppButtonBackgroundVarietyEnum.OUTLINED} accessibilityLabel={TestID.OpenKeyboardButton} /> @@ -467,12 +467,15 @@ const styles = StyleSheet.create({ backgroundColor: sharedColors.primary, }), dotInactive: castStyle.view({ - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, }), androidInputWorkaround: castStyle.text({ display: 'flex', position: 'absolute', bottom: -1000, }), - errorIcon: castStyle.text({ marginTop: 82, alignSelf: 'center' }), + errorIcon: castStyle.text({ + marginTop: 82, + alignSelf: 'center', + }), }) From 3c5e726bfe6fd6969eb1276c3f322bd9be8c6002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 28 Feb 2024 00:15:37 -0300 Subject: [PATCH 09/52] refactor colors --- src/components/BasicRow/index.tsx | 4 ++-- src/components/modal/index.tsx | 4 +--- src/screens/rnsManager/rnsManagerStyles.ts | 10 ++-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/components/BasicRow/index.tsx b/src/components/BasicRow/index.tsx index 1e083fcce..97d8c0264 100644 --- a/src/components/BasicRow/index.tsx +++ b/src/components/BasicRow/index.tsx @@ -153,7 +153,7 @@ const styles = StyleSheet.create({ container: castStyle.view({ marginTop: 10, paddingVertical: 10, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, height: 'auto', flexDirection: 'row', }), @@ -181,7 +181,7 @@ const styles = StyleSheet.create({ usdText: { textAlign: 'right', flex: 1, - color: sharedColors.labelLight, + color: sharedColors.text.label, }, horizontalPadding: { paddingRight: 1, diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index 169ae5f19..d57203705 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -157,9 +157,7 @@ export const ConfirmationModal = ({ const modalStyles = StyleSheet.create({ container: castStyle.view({ borderRadius: 25, - borderWidth: 1, - borderColor: '#000', - borderStyle: 'solid', + borderWidth: 0, padding: 15, }), header: castStyle.view({ diff --git a/src/screens/rnsManager/rnsManagerStyles.ts b/src/screens/rnsManager/rnsManagerStyles.ts index 0f592f797..3d778e42f 100644 --- a/src/screens/rnsManager/rnsManagerStyles.ts +++ b/src/screens/rnsManager/rnsManagerStyles.ts @@ -6,20 +6,14 @@ import { colors } from 'src/styles' export const rnsManagerStyles = StyleSheet.create({ scrollContainer: castStyle.view({ - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, }), container: castStyle.view({ flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: 'transparent', padding: 20, paddingTop: 50, }), - title: castStyle.text({ - color: sharedColors.subTitle, - }), - subtitle: castStyle.text({ - color: sharedColors.subTitle, - }), profileHeader: castStyle.view({ flexDirection: 'row', justifyContent: 'space-between', From ea7758415254264e74ea47bfc179e0e39dad073d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 28 Feb 2024 00:18:06 -0300 Subject: [PATCH 10/52] offline screen --- src/core/components/OfflineScreen.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/components/OfflineScreen.tsx b/src/core/components/OfflineScreen.tsx index 6e2589eac..2db6f1e8b 100644 --- a/src/core/components/OfflineScreen.tsx +++ b/src/core/components/OfflineScreen.tsx @@ -9,18 +9,21 @@ export const OfflineScreen = () => { return ( - + {t('offline_screen_title')} {t('offline_screen_description_1')} {t('offline_screen_description_2')} @@ -32,7 +35,7 @@ export const OfflineScreen = () => { const styles = StyleSheet.create({ container: { flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, justifyContent: 'center', alignItems: 'center', }, From 9f3e7c1d112b53a8d1b09442f18201b625bc9f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 28 Feb 2024 00:31:14 -0300 Subject: [PATCH 11/52] input and token balance --- src/components/address/AddressInput.tsx | 4 ++-- src/components/button/index.tsx | 2 +- src/components/input/index.tsx | 18 +++++++++--------- src/components/token/index.tsx | 19 +++++++++---------- src/screens/send/TransactionForm.tsx | 6 ++---- src/shared/constants/index.ts | 5 +++++ 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/components/address/AddressInput.tsx b/src/components/address/AddressInput.tsx index 7b9ce5491..f7dc27e98 100644 --- a/src/components/address/AddressInput.tsx +++ b/src/components/address/AddressInput.tsx @@ -57,7 +57,7 @@ interface StatusObject { const typeColorMap = new Map([ [Status.ERROR, sharedColors.danger], [Status.SUCCESS, sharedColors.success], - [Status.INFO, sharedColors.inputLabelColor], + [Status.INFO, sharedColors.text.label], ]) const defaultStatus = { type: Status.READY, value: '' } @@ -333,7 +333,7 @@ export const AddressInput = ({ autoCorrect={false} autoCapitalize={'none'} placeholder={placeholder} - placeholderTextColor={sharedColors.inputLabelColor} + placeholderTextColor={sharedColors.text.label} rightIcon={ !(value.address || value.displayAddress) ? { diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index 090e3fe49..da34a3d6b 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -105,7 +105,7 @@ export const AppButton = ({ disabledStyle, accessibilityLabel = '', onPress, - color = sharedColors.inputInactive, + color = sharedColors.background.secondary, textColor = sharedColors.text.primary, textType = 'button1', backgroundVariety = AppButtonBackgroundVarietyEnum.DEFAULT, diff --git a/src/components/input/index.tsx b/src/components/input/index.tsx index 739c8ed6e..bed315ef7 100644 --- a/src/components/input/index.tsx +++ b/src/components/input/index.tsx @@ -129,7 +129,7 @@ export const Input = ({ ) : ( @@ -187,7 +187,7 @@ export const Input = ({ style={styles.rightIcon} name={'close'} size={defaultIconSize} - color={sharedColors.white} + color={sharedColors.text.primary} /> ) : rightIcon && 'name' in rightIcon ? ( @@ -196,7 +196,7 @@ export const Input = ({ style={styles.rightIcon} name={rightIcon.name} size={rightIcon.size || defaultIconSize} - color={rightIcon.color || sharedColors.white} + color={rightIcon.color || sharedColors.text.primary} /> ) : ( @@ -213,7 +213,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, paddingLeft: 16, paddingRight: 16, marginTop: 12, @@ -221,7 +221,7 @@ const styles = StyleSheet.create({ minHeight: 80, }), containerActive: castStyle.view({ - backgroundColor: sharedColors.inputActive, + backgroundColor: sharedColors.input.active, }), contentPadding: castStyle.view({ paddingBottom: 18, @@ -229,7 +229,7 @@ const styles = StyleSheet.create({ label: castStyle.text({ marginTop: 10, marginBottom: 4, - color: sharedColors.inputLabelColor, + color: sharedColors.text.label, }), valueContainer: castStyle.view({ flex: 1, @@ -243,17 +243,17 @@ const styles = StyleSheet.create({ marginLeft: 12, }), subtitle: castStyle.text({ - color: sharedColors.inputLabelColor, + color: sharedColors.text.label, }), rightIcon: castStyle.text({ padding: defaultIconSize, }), placeholderText: castStyle.text({ flex: 1, - color: sharedColors.inputLabelColor, + color: sharedColors.text.label, }), valueText: castStyle.text({ marginTop: 14, - color: sharedColors.white, + color: sharedColors.text.primary, }), }) diff --git a/src/components/token/index.tsx b/src/components/token/index.tsx index accd32570..d39c278d8 100644 --- a/src/components/token/index.tsx +++ b/src/components/token/index.tsx @@ -102,7 +102,7 @@ export const TokenBalance = ({ )} {firstValue.symbolType === 'usd' && ( - + )} {secondValue.symbol === '<' && ( - + {'<'} )} - + )} {!isNaN(Number(secondValue?.balance)) && ( - + {hide ? '\u002A\u002A\u002A\u002A\u002A\u002A' : secondValue @@ -193,7 +193,7 @@ export const TokenBalance = ({ @@ -236,9 +236,8 @@ const styles = StyleSheet.create({ width: 20, height: 20, }), - subTitle: castStyle.text({ - color: sharedColors.subTitle, - opacity: 0.7, + secondValue: castStyle.text({ + color: sharedColors.text.label, }), error: castStyle.text({ color: sharedColors.dangerLight, @@ -250,7 +249,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', }), input: castStyle.text({ - color: sharedColors.white, + color: sharedColors.text.primary, fontWeight: '500', fontSize: 36, padding: 0, diff --git a/src/screens/send/TransactionForm.tsx b/src/screens/send/TransactionForm.tsx index 889b621eb..faa681c82 100644 --- a/src/screens/send/TransactionForm.tsx +++ b/src/screens/send/TransactionForm.tsx @@ -410,7 +410,6 @@ export const TransactionForm = ({ style={styles.marginTop10} firstValue={firstBalance} secondValue={secondBalance} - color={sharedColors.black} error={hasEnoughBalance ? t('transaction_form_error_balance') : ''} onSwap={onSwapBalance} editable @@ -440,7 +439,7 @@ export const TransactionForm = ({ @@ -513,7 +512,7 @@ export const TransactionForm = ({ hasEnoughBalance } color={sharedColors.white} - textColor={sharedColors.black} + textColor={sharedColors.text.secondary} /> Date: Wed, 28 Feb 2024 02:49:45 -0300 Subject: [PATCH 12/52] buttons --- src/components/accounts/AccountBox.tsx | 2 +- src/components/button/index.tsx | 4 +-- src/components/loading/LoadingScreen.tsx | 4 +-- src/components/mnemonic/index.tsx | 6 ++--- src/components/modal/index.tsx | 10 +++---- src/screens/contacts/ContactDetails.tsx | 10 +++---- src/screens/contacts/ContactFormScreen.tsx | 7 ++--- src/screens/contacts/index.tsx | 8 +++--- src/screens/createKeys/CreateKeysScreen.tsx | 4 +-- .../createKeys/SecurityInformation.tsx | 4 +-- .../import/ImportMasterKeyScreen.tsx | 4 +-- .../new/ConfirmNewMasterKeyScreen.tsx | 4 +-- .../createKeys/new/NewMasterKeyScreen.tsx | 6 ++--- src/screens/createKeys/retryLogin/index.tsx | 4 +-- src/screens/home/PortfolioComponent.tsx | 2 +- src/screens/home/index.tsx | 2 +- src/screens/home/tokenColor.ts | 2 +- src/screens/pinScreen/index.tsx | 8 +++--- src/screens/profile/ProfileCreateScreen.tsx | 4 +-- src/screens/rnsManager/AliasBoughtScreen.tsx | 4 +-- .../rnsManager/PurchaseDomainScreen.tsx | 8 +++--- src/screens/rnsManager/SearchDomainScreen.tsx | 26 +++---------------- src/screens/send/SendScreen.tsx | 4 +-- src/screens/send/TransactionForm.tsx | 4 +-- src/screens/settings/RelayDeployScreen.tsx | 15 ++++++----- src/screens/settings/SettingsScreen.tsx | 16 ++++++------ .../TransactionSummaryComponent.tsx | 10 +++---- src/screens/walletConnect/index.tsx | 4 +-- src/shared/constants/index.ts | 12 ++++++--- .../ReviewTransactionContainer.tsx | 4 +-- .../SignRequestHandlerContainer.tsx | 8 +++--- 31 files changed, 99 insertions(+), 111 deletions(-) diff --git a/src/components/accounts/AccountBox.tsx b/src/components/accounts/AccountBox.tsx index 80eb55804..5e5f6669b 100644 --- a/src/components/accounts/AccountBox.tsx +++ b/src/components/accounts/AccountBox.tsx @@ -215,7 +215,7 @@ export const AccountBox = ({ title={t('wallet_backup_delete_button')} onPress={() => setIsDeleteConfirmationVisible(true)} backgroundVariety={AppButtonBackgroundVarietyEnum.OUTLINED} - color={sharedColors.white} + color={sharedColors.button.primaryBackground} style={styles.deleteButton} /> { sharedStyles.contentCenter, styles.activityIndicatorViewStyle, ]}> - + ) @@ -25,6 +25,6 @@ export const LoadingScreen = ({ isVisible }: Props) => { const styles = StyleSheet.create({ activityIndicatorViewStyle: castStyle.view({ - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, }), }) diff --git a/src/components/mnemonic/index.tsx b/src/components/mnemonic/index.tsx index fd56445d1..a4d69a072 100644 --- a/src/components/mnemonic/index.tsx +++ b/src/components/mnemonic/index.tsx @@ -86,13 +86,13 @@ export const MnemonicComponent = ({ title={pillText} textColor={ isMnemonicVisible - ? sharedColors.white - : sharedColors.inputActive + ? sharedColors.text.primary + : sharedColors.background.accent } color={ isMnemonicVisible ? sharedColors.primary - : sharedColors.inputActive + : sharedColors.background.accent } widthVariety={AppButtonWidthVarietyEnum.INLINE} accessibilityLabel={`${index}.${word}`} diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index d57203705..359f85168 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -129,10 +129,8 @@ export const ConfirmationModal = ({ title={okText} onPress={onOk} accessibilityLabel={'okText'} - color={buttons && buttons[0] ? buttons[0].color : sharedColors.white} - textColor={ - buttons && buttons[0] ? buttons[0].textColor : sharedColors.black - } + color={buttons?.[0]?.color || sharedColors.button.primaryBackground} + textColor={buttons?.[0]?.textColor || sharedColors.button.primaryText} /> {cancelText && ( )} diff --git a/src/screens/contacts/ContactDetails.tsx b/src/screens/contacts/ContactDetails.tsx index 66ba23ec7..c16ea2461 100644 --- a/src/screens/contacts/ContactDetails.tsx +++ b/src/screens/contacts/ContactDetails.tsx @@ -117,7 +117,7 @@ export const ContactDetails = ({ useEffect(() => { if (isFocused) { - dispatch(changeTopColor(sharedColors.inputInactive)) + dispatch(changeTopColor(sharedColors.background.secondary)) } }, [dispatch, isFocused]) @@ -261,8 +261,8 @@ export const ContactDetails = ({ proposed: false, }) } - color={sharedColors.white} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> ) @@ -271,13 +271,13 @@ export const ContactDetails = ({ const styles = StyleSheet.create({ screen: castStyle.view({ flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, }), scrollviewContainer: castStyle.view({ paddingBottom: 144, }), contactDetailsView: castStyle.view({ - backgroundColor: sharedColors.inputActive, + backgroundColor: sharedColors.background.accent, justifyContent: 'center', alignItems: 'center', height: 167, diff --git a/src/screens/contacts/ContactFormScreen.tsx b/src/screens/contacts/ContactFormScreen.tsx index c7fceaa89..32da131bc 100644 --- a/src/screens/contacts/ContactFormScreen.tsx +++ b/src/screens/contacts/ContactFormScreen.tsx @@ -200,9 +200,9 @@ export const ContactFormScreen = ({ headerTitle: editMode ? t('contact_form_title_edit') : t('contact_form_title_create'), - headerTintColor: sharedColors.white, + headerTintColor: sharedColors.text.primary, headerStyle: { - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, }, headerRightContainerStyle: { paddingTop: 0, @@ -268,7 +268,8 @@ export const ContactFormScreen = ({ title={t('contact_form_button_save')} onPress={handleSubmit(saveContact)} style={sharedStyles.appButtonBottom} - textColor={sharedColors.inputInactive} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} disabled={hasErrors || rnsLoading} /> diff --git a/src/screens/contacts/index.tsx b/src/screens/contacts/index.tsx index df6a40fa9..adf0627dc 100644 --- a/src/screens/contacts/index.tsx +++ b/src/screens/contacts/index.tsx @@ -88,7 +88,7 @@ export const ContactsScreen = ({ navigation }: ContactsListScreenProps) => { useEffect(() => { if (isFocused) { - dispatch(changeTopColor(sharedColors.black)) + dispatch(changeTopColor(sharedColors.background.primary)) } }, [dispatch, isFocused]) @@ -156,7 +156,7 @@ export const ContactsScreen = ({ navigation }: ContactsListScreenProps) => { ) }> { accessibilityLabel={testIDs.newContact} onPress={() => navigation.navigate(contactsStackRouteNames.ContactForm)} style={styles.newContactButton} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> ) @@ -209,7 +210,6 @@ const styles = StyleSheet.create({ bottom: 30, left: 24, right: 24, - backgroundColor: sharedColors.white, }), recentContacts: castStyle.view({ height: 100, diff --git a/src/screens/createKeys/CreateKeysScreen.tsx b/src/screens/createKeys/CreateKeysScreen.tsx index 890c31247..8549a7459 100644 --- a/src/screens/createKeys/CreateKeysScreen.tsx +++ b/src/screens/createKeys/CreateKeysScreen.tsx @@ -45,8 +45,8 @@ export const CreateKeysScreen = ({ } accessibilityLabel={'newWallet'} title={t('initial_screen_button_create')} - color={sharedColors.white} - textColor={sharedColors.text.secondary} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> diff --git a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx index 5806605ee..68b1971d3 100644 --- a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx +++ b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx @@ -279,8 +279,8 @@ export const ImportMasterKeyScreen = ( { style={styles.button} title={t('confirm_key_button')} onPress={handleSubmit(onSubmitEditing)} - color={sharedColors.white} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> {!formIsValid || hasFormSuccess ? ( diff --git a/src/screens/createKeys/new/NewMasterKeyScreen.tsx b/src/screens/createKeys/new/NewMasterKeyScreen.tsx index 45538d1ff..84359b629 100644 --- a/src/screens/createKeys/new/NewMasterKeyScreen.tsx +++ b/src/screens/createKeys/new/NewMasterKeyScreen.tsx @@ -75,8 +75,8 @@ export const NewMasterKeyScreen = ({ navigation }: Props) => { navigation.navigate(createKeysRouteNames.ConfirmNewMasterKey, { @@ -87,7 +87,7 @@ export const NewMasterKeyScreen = ({ navigation }: Props) => { { {__DEV__ && ( ({ diff --git a/src/screens/home/tokenColor.ts b/src/screens/home/tokenColor.ts index 550f51798..68b986acf 100644 --- a/src/screens/home/tokenColor.ts +++ b/src/screens/home/tokenColor.ts @@ -15,7 +15,7 @@ export const getTokenColor = (tokenSymbol: string): string => { case 'BTCT': return tokenColors.btc default: - return sharedColors.background.accent + return sharedColors.background.highlight } } diff --git a/src/screens/pinScreen/index.tsx b/src/screens/pinScreen/index.tsx index 43235e2e3..c345223e3 100644 --- a/src/screens/pinScreen/index.tsx +++ b/src/screens/pinScreen/index.tsx @@ -434,13 +434,11 @@ export const PinScreen = ({ navigation, route }: Props) => { )} diff --git a/src/screens/profile/ProfileCreateScreen.tsx b/src/screens/profile/ProfileCreateScreen.tsx index 408b79263..b1e620f73 100644 --- a/src/screens/profile/ProfileCreateScreen.tsx +++ b/src/screens/profile/ProfileCreateScreen.tsx @@ -268,8 +268,8 @@ export const ProfileCreateScreen = ({ style={rnsManagerStyles.button} title={t('profile_register_your_username_button_text')} accessibilityLabel={'registerYourUserName'} - color={sharedColors.white} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} disabled={isPurchasingProfile ? false : !!username} onPress={() => { navigation.navigate(profileStackRouteNames.SearchDomain) diff --git a/src/screens/rnsManager/AliasBoughtScreen.tsx b/src/screens/rnsManager/AliasBoughtScreen.tsx index 250589480..64b634511 100644 --- a/src/screens/rnsManager/AliasBoughtScreen.tsx +++ b/src/screens/rnsManager/AliasBoughtScreen.tsx @@ -58,8 +58,8 @@ export const AliasBoughtScreen = ({ diff --git a/src/screens/rnsManager/PurchaseDomainScreen.tsx b/src/screens/rnsManager/PurchaseDomainScreen.tsx index a95843dac..40a5fec02 100644 --- a/src/screens/rnsManager/PurchaseDomainScreen.tsx +++ b/src/screens/rnsManager/PurchaseDomainScreen.tsx @@ -162,16 +162,16 @@ export const PurchaseDomainScreen = ({ navigation }: Props) => { onPress={registerDomain} accessibilityLabel={TestID.PurchaseDomainButton} title={t('purchase_username_button')} - color={sharedColors.white} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> diff --git a/src/screens/rnsManager/SearchDomainScreen.tsx b/src/screens/rnsManager/SearchDomainScreen.tsx index 6d942e763..4151ba86e 100644 --- a/src/screens/rnsManager/SearchDomainScreen.tsx +++ b/src/screens/rnsManager/SearchDomainScreen.tsx @@ -342,17 +342,8 @@ export const SearchDomainScreen = ({ navigation }: Props) => { onPress={handleSubmit(onSubmit)} accessibilityLabel={t('request_username_button')} title={t('request_username_button')} - color={ - !isRequestButtonDisabled - ? sharedColors.white - : sharedColors.borderColor - } - textColor={ - !isRequestButtonDisabled - ? sharedColors.black - : sharedColors.labelLight - } - disabledStyle={rnsManagerStyles.disabledButton} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} loading={isCalculatingPrice} /> ) : ( @@ -362,17 +353,8 @@ export const SearchDomainScreen = ({ navigation }: Props) => { onPress={handleSetProfile} accessibilityLabel={t('save_username_button')} title={t('save_username_button')} - color={ - !isSaveButtonDisabled - ? sharedColors.white - : sharedColors.borderColor - } - textColor={ - !isSaveButtonDisabled - ? sharedColors.black - : sharedColors.labelLight - } - disabledStyle={rnsManagerStyles.disabledButton} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> )} diff --git a/src/screens/send/SendScreen.tsx b/src/screens/send/SendScreen.tsx index 891518bac..9af3a7b1f 100644 --- a/src/screens/send/SendScreen.tsx +++ b/src/screens/send/SendScreen.tsx @@ -214,8 +214,8 @@ export const SendScreen = ({ { title: t('send_screen_return_to_home'), onPress: onGoToHome, - color: sharedColors.white, - textColor: sharedColors.black, + color: sharedColors.button.primaryBackground, + textColor: sharedColors.button.primaryText, accessibilityLabel: 'return', }, ]} diff --git a/src/screens/send/TransactionForm.tsx b/src/screens/send/TransactionForm.tsx index faa681c82..d26fccb80 100644 --- a/src/screens/send/TransactionForm.tsx +++ b/src/screens/send/TransactionForm.tsx @@ -511,8 +511,8 @@ export const TransactionForm = ({ amount === 0 || hasEnoughBalance } - color={sharedColors.white} - textColor={sharedColors.text.secondary} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> - + {t('wallet_deploy_title')} {t('wallet_deploy_desc1')} {t('wallet_deploy_desc2')} @@ -158,7 +161,7 @@ export const RelayDeployScreen = ({ + color={sharedColors.text.label}> {t('wallet_deploy_wallet_deploying')} @@ -176,7 +179,8 @@ export const RelayDeployScreen = ({ onPress={deploy} style={styles.button} accessibilityLabel="deploy" - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> )} @@ -215,6 +219,5 @@ const styles = StyleSheet.create({ button: castStyle.view({ position: 'absolute', bottom: 14, - backgroundColor: sharedColors.white, }), }) diff --git a/src/screens/settings/SettingsScreen.tsx b/src/screens/settings/SettingsScreen.tsx index 1a8333798..8f2c5a47a 100644 --- a/src/screens/settings/SettingsScreen.tsx +++ b/src/screens/settings/SettingsScreen.tsx @@ -147,35 +147,35 @@ export const SettingsScreen = ({ - + {t('settings_screen_version')} {version}- {Config.USE_RELAY ? 'relay' : 'eoa'} - + {t('settings_screen_smart_wallet_factory')} - + {smartWalletFactoryAddress} - + {t('settings_screen_rpc_url')} - + {rpcUrl} - + {t('settings_screen_backend_url')} - + {walletServiceUrl} @@ -187,7 +187,7 @@ export const SettingsScreen = ({ const styles = StyleSheet.create({ container: castStyle.view({ height: '100%', - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, paddingHorizontal: 24, }), mainView: castStyle.view({ diff --git a/src/screens/transactionSummary/TransactionSummaryComponent.tsx b/src/screens/transactionSummary/TransactionSummaryComponent.tsx index f71e0c585..3341efd8e 100644 --- a/src/screens/transactionSummary/TransactionSummaryComponent.tsx +++ b/src/screens/transactionSummary/TransactionSummaryComponent.tsx @@ -115,7 +115,7 @@ export const TransactionSummaryComponent = ({ + color={sharedColors.text.label}> {title} + color={sharedColors.text.label}> {t('transaction_summary_function_type')}: {functionName} )} @@ -311,8 +311,8 @@ export const TransactionSummaryComponent = ({ )} @@ -324,7 +324,7 @@ export const TransactionSummaryComponent = ({ const styles = StyleSheet.create({ screen: castStyle.view({ flex: 1, - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, paddingHorizontal: 22, }), contentPadding: castStyle.view({ paddingBottom: 114 }), diff --git a/src/screens/walletConnect/index.tsx b/src/screens/walletConnect/index.tsx index 0d125dabb..6b2cee141 100644 --- a/src/screens/walletConnect/index.tsx +++ b/src/screens/walletConnect/index.tsx @@ -213,8 +213,8 @@ export const WalletConnectScreen = ({ route }: Props) => { diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index cc18eacdc..6b8f5bcdb 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -41,8 +41,8 @@ export const sharedColors = { background: { primary: '#000', secondary: '#252525', - accent: '#575757', - highlight: '#B8B8B8', + accent: '#3A3A3A', + highlight: '#575757', }, input: { @@ -57,6 +57,13 @@ export const sharedColors = { link: '#4152E6', }, + button: { + primaryBackground: '#fff', + primaryText: '#000', + secondaryBackground: '#252525', + secondaryText: '#fff', + }, + stepper: { active: '#4B5CF0', inactive: '#3A3A3A', @@ -131,7 +138,6 @@ export const sharedStyles = StyleSheet.create({ fontWeight: 'bold', }), appButtonBottom: castStyle.view({ - backgroundColor: sharedColors.white, position: 'absolute', bottom: 30, left: 24, diff --git a/src/ux/requestsModal/ReviewRelayTransaction/ReviewTransactionContainer.tsx b/src/ux/requestsModal/ReviewRelayTransaction/ReviewTransactionContainer.tsx index 736add9e6..8c21d543d 100644 --- a/src/ux/requestsModal/ReviewRelayTransaction/ReviewTransactionContainer.tsx +++ b/src/ux/requestsModal/ReviewRelayTransaction/ReviewTransactionContainer.tsx @@ -243,8 +243,8 @@ export const ReviewTransactionContainer = ({ { title: t('transaction_summary_title_confirm_button_title'), onPress: confirmTransaction, - color: sharedColors.white, - textColor: sharedColors.black, + color: sharedColors.button.primaryBackground, + textColor: sharedColors.button.primaryText, accessibilityLabel: 'Confirm', disabled: insufficientFunds, }, diff --git a/src/ux/requestsModal/SignRequestHandlerContainer.tsx b/src/ux/requestsModal/SignRequestHandlerContainer.tsx index b46bdf5b8..767c0520b 100644 --- a/src/ux/requestsModal/SignRequestHandlerContainer.tsx +++ b/src/ux/requestsModal/SignRequestHandlerContainer.tsx @@ -55,16 +55,16 @@ export const SignRequestHandlerContainer = ({ accessibilityLabel="Confirm" title={t('transaction_summary_title_confirm_button_title')} onPress={onConfirmTap} - color={sharedColors.white} - textColor={sharedColors.black} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} style={styles.buttonsStyle} /> From 70fe24e0e594f6b0d49fc42f336b00b01259db7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 28 Feb 2024 03:04:25 -0300 Subject: [PATCH 13/52] remove inputActive and inputInactive constants --- src/components/InfoBox/index.tsx | 2 +- src/components/accounts/AccountBox.tsx | 2 +- src/components/appTouchable/index.tsx | 2 +- src/components/button/index.tsx | 2 +- src/components/checkbox/index.tsx | 2 +- src/lib/rns/useProfileStatusColors.ts | 10 +++++----- src/navigation/contactsNavigator/index.tsx | 2 +- src/screens/contacts/ContactDetails.tsx | 5 +++-- .../contacts/components/ContactCard.tsx | 2 +- .../import/ImportMasterKeyScreen.tsx | 2 +- src/screens/pinScreen/index.tsx | 19 +++++++++++-------- src/screens/profile/ProfileCreateScreen.tsx | 2 +- src/screens/receive/ReceiveScreen.tsx | 2 +- src/screens/rnsManager/AvatarIconBox.tsx | 2 +- src/screens/rnsManager/SearchDomainScreen.tsx | 4 +--- src/screens/rnsManager/rnsManagerStyles.ts | 2 +- .../TransactionSummaryComponent.tsx | 4 +++- src/screens/walletConnect/DappItem.tsx | 2 +- src/shared/constants/index.ts | 3 --- 19 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/components/InfoBox/index.tsx b/src/components/InfoBox/index.tsx index 432f004ec..63aa436f1 100644 --- a/src/components/InfoBox/index.tsx +++ b/src/components/InfoBox/index.tsx @@ -24,7 +24,7 @@ export const InfoBox = ({ description, buttonText, onPress, - backgroundColor = sharedColors.inputInactive, + backgroundColor = sharedColors.background.secondary, avatarBackgroundColor = sharedColors.qrColor, }: InfoBoxProps) => { const [shouldHide, setShouldHide] = useState(false) diff --git a/src/components/accounts/AccountBox.tsx b/src/components/accounts/AccountBox.tsx index 5e5f6669b..ef63f6dc4 100644 --- a/src/components/accounts/AccountBox.tsx +++ b/src/components/accounts/AccountBox.tsx @@ -231,7 +231,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, paddingLeft: 16, paddingRight: 24, marginTop: 12, diff --git a/src/components/appTouchable/index.tsx b/src/components/appTouchable/index.tsx index fd3d1af5f..4338f3237 100644 --- a/src/components/appTouchable/index.tsx +++ b/src/components/appTouchable/index.tsx @@ -41,7 +41,7 @@ export const AppTouchable = ({ children, style, width, ...props }: Props) => { android_ripple={{ borderless: false, foreground: true, - color: sharedColors.inputActive, + color: sharedColors.background.accent, }} {...props}> {children} diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index f1e96b9da..54b708249 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -186,6 +186,6 @@ const styles = StyleSheet.create({ paddingTop: 2, }), disabledButton: castStyle.view({ - backgroundColor: sharedColors.inputActive, + backgroundColor: sharedColors.background.accent, }), }) diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx index a8f81bab9..cb8c52fd1 100644 --- a/src/components/checkbox/index.tsx +++ b/src/components/checkbox/index.tsx @@ -61,7 +61,7 @@ const styles = StyleSheet.create({ height: 16, width: 16, borderRadius: 4, - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, overflow: 'hidden', }), checkboxEnabled: castStyle.view({ diff --git a/src/lib/rns/useProfileStatusColors.ts b/src/lib/rns/useProfileStatusColors.ts index 8c6304941..e41d0ece4 100644 --- a/src/lib/rns/useProfileStatusColors.ts +++ b/src/lib/rns/useProfileStatusColors.ts @@ -9,12 +9,12 @@ export const useProfileStatusColors = () => { case ProfileStatus.REQUESTING: return { startColor: sharedColors.warning, - endColor: sharedColors.inputActive, + endColor: sharedColors.background.accent, } case ProfileStatus.READY_TO_PURCHASE: return { startColor: sharedColors.successLight, - endColor: sharedColors.inputActive, + endColor: sharedColors.background.accent, } case ProfileStatus.PURCHASING: return { @@ -24,11 +24,11 @@ export const useProfileStatusColors = () => { case ProfileStatus.REQUESTING_ERROR: return { startColor: sharedColors.danger, - endColor: sharedColors.inputActive, + endColor: sharedColors.background.accent, } } return { - startColor: sharedColors.inputActive, - endColor: sharedColors.inputActive, + startColor: sharedColors.background.accent, + endColor: sharedColors.background.accent, } } diff --git a/src/navigation/contactsNavigator/index.tsx b/src/navigation/contactsNavigator/index.tsx index 2a9c5b743..c42444ecc 100644 --- a/src/navigation/contactsNavigator/index.tsx +++ b/src/navigation/contactsNavigator/index.tsx @@ -42,7 +42,7 @@ export const ContactsNavigation = ({ options={screenOptionsWithHeader( top, undefined, - sharedColors.inputInactive, + sharedColors.background.secondary, )} /> diff --git a/src/screens/contacts/ContactDetails.tsx b/src/screens/contacts/ContactDetails.tsx index c16ea2461..faee1ab96 100644 --- a/src/screens/contacts/ContactDetails.tsx +++ b/src/screens/contacts/ContactDetails.tsx @@ -136,7 +136,7 @@ export const ContactDetails = ({ ), headerStyle: { - backgroundColor: sharedColors.inputActive, + backgroundColor: sharedColors.background.accent, }, headerRightContainerStyle: { paddingTop: 0, @@ -197,7 +197,8 @@ export const ContactDetails = ({ - + { const styles = StyleSheet.create({ contactCard: castStyle.view({ - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, paddingVertical: 13.5, borderRadius: 10, marginHorizontal: 5, diff --git a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx index 68b1971d3..257187186 100644 --- a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx +++ b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx @@ -268,7 +268,7 @@ export const ImportMasterKeyScreen = ( activeColor={sharedColors.white} activeDotWidth={8} activeDotHeight={8} - passiveColor={sharedColors.inputActive} + passiveColor={sharedColors.background.accent} passiveDotHeight={6} passiveDotWidth={6} marginHorizontal={6} diff --git a/src/screens/pinScreen/index.tsx b/src/screens/pinScreen/index.tsx index c345223e3..c99089def 100644 --- a/src/screens/pinScreen/index.tsx +++ b/src/screens/pinScreen/index.tsx @@ -44,19 +44,19 @@ const defaultPin = [null, null, null, null] // pin exist const pinExistNoSteps = [ - sharedColors.inputActive, - sharedColors.inputActive, - sharedColors.inputActive, + sharedColors.background.accent, + sharedColors.background.accent, + sharedColors.background.accent, ] const pinExistFirstStep = [ sharedColors.successLight, - sharedColors.inputActive, - sharedColors.inputActive, + sharedColors.background.accent, + sharedColors.background.accent, ] const pinExistSecondStep = [ sharedColors.successLight, sharedColors.successLight, - sharedColors.inputActive, + sharedColors.background.accent, ] const pinExistComplete = [ sharedColors.successLight, @@ -65,10 +65,13 @@ const pinExistComplete = [ ] // no pin exist -const noPinExistNoSteps = [sharedColors.inputActive, sharedColors.inputActive] +const noPinExistNoSteps = [ + sharedColors.background.accent, + sharedColors.background.accent, +] const noPinExistFirstStep = [ sharedColors.successLight, - sharedColors.inputActive, + sharedColors.background.accent, ] const noPinExistComplete = [ sharedColors.successLight, diff --git a/src/screens/profile/ProfileCreateScreen.tsx b/src/screens/profile/ProfileCreateScreen.tsx index b1e620f73..c403c5491 100644 --- a/src/screens/profile/ProfileCreateScreen.tsx +++ b/src/screens/profile/ProfileCreateScreen.tsx @@ -190,7 +190,7 @@ export const ProfileCreateScreen = ({ - + { // it exists for ios but shows error https://reactnative.dev/docs/scrollview#automaticallyadjustkeyboardinsets-ios automaticallyAdjustKeyboardInsets> - + {t('request_username_title')} diff --git a/src/screens/rnsManager/rnsManagerStyles.ts b/src/screens/rnsManager/rnsManagerStyles.ts index 3d778e42f..359ba760e 100644 --- a/src/screens/rnsManager/rnsManagerStyles.ts +++ b/src/screens/rnsManager/rnsManagerStyles.ts @@ -23,7 +23,7 @@ export const rnsManagerStyles = StyleSheet.create({ }), profileImageContainer: castStyle.view({ alignItems: 'center', - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, borderRadius: 10, paddingVertical: 20, }), diff --git a/src/screens/transactionSummary/TransactionSummaryComponent.tsx b/src/screens/transactionSummary/TransactionSummaryComponent.tsx index 3341efd8e..989394139 100644 --- a/src/screens/transactionSummary/TransactionSummaryComponent.tsx +++ b/src/screens/transactionSummary/TransactionSummaryComponent.tsx @@ -138,7 +138,9 @@ export const TransactionSummaryComponent = ({ style={[ styles.summaryAlignment, styles.statusContainer, - status ? { backgroundColor: sharedColors.inputInactive } : null, + status + ? { backgroundColor: sharedColors.background.secondary } + : null, ]}> {status ? t('transaction_summary_status') : ''} diff --git a/src/screens/walletConnect/DappItem.tsx b/src/screens/walletConnect/DappItem.tsx index 7ea49db11..61cbe042e 100644 --- a/src/screens/walletConnect/DappItem.tsx +++ b/src/screens/walletConnect/DappItem.tsx @@ -60,7 +60,7 @@ export const DappItem = ({ const styles = StyleSheet.create({ container: castStyle.view({ flexDirection: 'row', - backgroundColor: sharedColors.inputInactive, + backgroundColor: sharedColors.background.secondary, borderRadius: 10, marginBottom: 12, alignItems: 'center', diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 6b8f5bcdb..02a71e098 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -25,9 +25,6 @@ export const sharedColors = { danger: '#E94141', dangerLight: '#ED6060', white: '#FFFFFF', - inputInactive: '#252525', - inputActive: '#3A3A3A', - inputLabelColor: '#B8B8B8', borderColor: '#575757', labelLight: '#B8B8B8', subTitle: '#FBFBFB', From 1c1e6f9851046a25339a6b3fb5612b13a8e836e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Mon, 25 Mar 2024 10:45:51 -0300 Subject: [PATCH 14/52] make user icon as svg in order to change its colors --- .../BasicRow/BasicRowWithContact.tsx | 10 +++++++- src/components/icons/UserIcon.tsx | 24 ++++++++++++++++++ src/images/user.png | Bin 12570 -> 0 bytes 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/components/icons/UserIcon.tsx delete mode 100644 src/images/user.png diff --git a/src/components/BasicRow/BasicRowWithContact.tsx b/src/components/BasicRow/BasicRowWithContact.tsx index fe75b9f7e..b96413e0b 100644 --- a/src/components/BasicRow/BasicRowWithContact.tsx +++ b/src/components/BasicRow/BasicRowWithContact.tsx @@ -1,5 +1,8 @@ import { BasicRow, BasicRowProps } from 'components/BasicRow/index' import { Contact } from 'shared/types' +import { sharedColors } from 'shared/constants' + +import UserIcon from '../icons/UserIcon' export interface BasicRowWithContact extends BasicRowProps { contact: Contact | undefined @@ -13,7 +16,12 @@ export const BasicRowWithContact = ({ {...props} avatar={{ name: contact?.name, - imageSource: contact ? undefined : require('src/images/user.png'), + icon: contact ? undefined : ( + + ), }} /> ) diff --git a/src/components/icons/UserIcon.tsx b/src/components/icons/UserIcon.tsx new file mode 100644 index 000000000..73becbbd1 --- /dev/null +++ b/src/components/icons/UserIcon.tsx @@ -0,0 +1,24 @@ +import Svg, { Path, Rect, SvgProps } from 'react-native-svg' + +interface Props extends SvgProps { + color?: string + backgroundColor?: string +} + +export const UserIcon = ({ + width = 44, + height = 46, + color = '#B8B8B8', + backgroundColor = '#252525', + ...props +}: Props) => ( + + + + +) + +export default UserIcon diff --git a/src/images/user.png b/src/images/user.png deleted file mode 100644 index b3b81d8ef945d79131418d76d0f601eaf2183e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12570 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 Date: Mon, 25 Mar 2024 10:52:21 -0300 Subject: [PATCH 15/52] change the top color --- src/screens/activity/ActivityScreen.tsx | 3 ++- src/screens/walletConnect/index.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/screens/activity/ActivityScreen.tsx b/src/screens/activity/ActivityScreen.tsx index 41f929bdc..d4ffadd4d 100644 --- a/src/screens/activity/ActivityScreen.tsx +++ b/src/screens/activity/ActivityScreen.tsx @@ -37,7 +37,7 @@ export const ActivityScreen = ({ navigation }: ActivityMainScreenProps) => { useEffect(() => { if (isFocused) { - dispatch(changeTopColor(sharedColors.black)) + dispatch(changeTopColor(sharedColors.background.primary)) } }, [dispatch, isFocused]) @@ -49,6 +49,7 @@ export const ActivityScreen = ({ navigation }: ActivityMainScreenProps) => { keyExtractor={item => item.id} onEndReachedThreshold={0.2} refreshing={loading} + showsVerticalScrollIndicator={false} renderItem={({ item }) => ( { useEffect(() => { if (isFocused) { - dispatch(changeTopColor(sharedColors.black)) + dispatch(changeTopColor(sharedColors.background.primary)) } }, [dispatch, isFocused]) From f06b8dfce2b3b5b5f930a1026aaccf007a0300cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Mon, 25 Mar 2024 11:43:15 -0300 Subject: [PATCH 16/52] adjustments --- .../QRCodeScanner/useCheckCameraPermissions.ts | 2 +- src/components/avatar/index.tsx | 9 +++------ src/components/icons/HomeIcon.tsx | 2 +- src/components/icons/NetworkIcon.tsx | 2 +- src/components/icons/ScanIcon.tsx | 4 ++-- src/components/icons/TransactionsIcon.tsx | 2 +- src/components/icons/UsersIcon.tsx | 2 +- src/navigation/profileNavigator/index.tsx | 2 +- src/screens/activity/ActivityScreen.tsx | 2 +- src/ux/appHeader/ProfileHandler.tsx | 4 ++-- src/ux/appHeader/index.tsx | 2 +- 11 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/components/QRCodeScanner/useCheckCameraPermissions.ts b/src/components/QRCodeScanner/useCheckCameraPermissions.ts index 914b451ee..910e0f018 100644 --- a/src/components/QRCodeScanner/useCheckCameraPermissions.ts +++ b/src/components/QRCodeScanner/useCheckCameraPermissions.ts @@ -5,7 +5,7 @@ import { Alert, Linking } from 'react-native' import { navigationContainerRef } from 'core/Core' const checkCameraPermissions = async (t: (text: string) => string) => { - const cameraPermission = await Camera.getCameraPermissionStatus() + const cameraPermission = Camera.getCameraPermissionStatus() if (cameraPermission === 'not-determined') { const cameraStatus = await Camera.requestCameraPermission() cameraStatus === 'denied' && navigationContainerRef.goBack() diff --git a/src/components/avatar/index.tsx b/src/components/avatar/index.tsx index a78c91e3f..3a6489b64 100644 --- a/src/components/avatar/index.tsx +++ b/src/components/avatar/index.tsx @@ -32,7 +32,7 @@ export const Avatar = ({ name, letterColor, }: Props) => { - const halfSize = useMemo(() => size / 2, [size]) + const halfSize = size / 2 const firstCapital = useMemo(() => { if (name) { const letters = name.split('') @@ -56,10 +56,10 @@ export const Avatar = ({ {(!icon && !imageSource) || (icon && imageSource) ? ( {firstCapital} @@ -79,7 +79,4 @@ const styles = StyleSheet.create({ alignItems: 'center', overflow: 'hidden', }), - letter: castStyle.text({ - ...fonts.regular, - }), }) diff --git a/src/components/icons/HomeIcon.tsx b/src/components/icons/HomeIcon.tsx index 58cddf433..5283f4ee6 100644 --- a/src/components/icons/HomeIcon.tsx +++ b/src/components/icons/HomeIcon.tsx @@ -12,7 +12,7 @@ const HomeIcon = ({ {active && } diff --git a/src/components/icons/NetworkIcon.tsx b/src/components/icons/NetworkIcon.tsx index ea40a5fa1..c498cc1a7 100644 --- a/src/components/icons/NetworkIcon.tsx +++ b/src/components/icons/NetworkIcon.tsx @@ -12,7 +12,7 @@ const NetworkIcon = ({ {active && } diff --git a/src/components/icons/ScanIcon.tsx b/src/components/icons/ScanIcon.tsx index f4c40bcac..c93041b0d 100644 --- a/src/components/icons/ScanIcon.tsx +++ b/src/components/icons/ScanIcon.tsx @@ -13,8 +13,8 @@ export const ScanIcon = ({ {active && } diff --git a/src/components/icons/TransactionsIcon.tsx b/src/components/icons/TransactionsIcon.tsx index a230ecab2..a2738ed42 100644 --- a/src/components/icons/TransactionsIcon.tsx +++ b/src/components/icons/TransactionsIcon.tsx @@ -12,7 +12,7 @@ const TransactionsIcon = ({ {active && } diff --git a/src/components/icons/UsersIcon.tsx b/src/components/icons/UsersIcon.tsx index 286f4c203..c280ca67b 100644 --- a/src/components/icons/UsersIcon.tsx +++ b/src/components/icons/UsersIcon.tsx @@ -12,7 +12,7 @@ const UsersIcon = ({ {active && } diff --git a/src/navigation/profileNavigator/index.tsx b/src/navigation/profileNavigator/index.tsx index 85ab3bb5c..cb002ad43 100644 --- a/src/navigation/profileNavigator/index.tsx +++ b/src/navigation/profileNavigator/index.tsx @@ -30,7 +30,7 @@ const ProfileStack = createStackNavigator() export const headerLeftOption = (goBack: () => void) => ( - + ) diff --git a/src/screens/activity/ActivityScreen.tsx b/src/screens/activity/ActivityScreen.tsx index d4ffadd4d..e9a5593db 100644 --- a/src/screens/activity/ActivityScreen.tsx +++ b/src/screens/activity/ActivityScreen.tsx @@ -62,7 +62,7 @@ export const ActivityScreen = ({ navigation }: ActivityMainScreenProps) => { refreshControl={ } diff --git a/src/ux/appHeader/ProfileHandler.tsx b/src/ux/appHeader/ProfileHandler.tsx index 7a34b4f56..f652f1c6c 100644 --- a/src/ux/appHeader/ProfileHandler.tsx +++ b/src/ux/appHeader/ProfileHandler.tsx @@ -37,7 +37,7 @@ export const ProfileHandler = ({ navigation }: Props) => { @@ -133,7 +133,7 @@ const styles = StyleSheet.create({ paddingLeft: 6, }), underline: castStyle.text({ - textDecorationColor: sharedColors.white, + textDecorationColor: sharedColors.text.primary, textDecorationLine: 'underline', paddingLeft: 6, }), diff --git a/src/ux/appHeader/index.tsx b/src/ux/appHeader/index.tsx index 3ae7166dd..650273bd2 100644 --- a/src/ux/appHeader/index.tsx +++ b/src/ux/appHeader/index.tsx @@ -54,7 +54,7 @@ export const AppHeader = ({ navigation, route }: HeaderProps) => { width={16} onPress={openMenu} accessibilityLabel="settings"> - + From 5060f7a71165f5e47330f3250223dbab20aa42fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Mon, 25 Mar 2024 13:14:34 -0300 Subject: [PATCH 17/52] no dapps image --- src/components/icons/NoDappsImage.tsx | 49 ++++++++++++++++++++++++++ src/images/empty-dapps.png | Bin 31352 -> 0 bytes src/screens/walletConnect/index.tsx | 13 ++++--- src/shared/constants/index.ts | 1 + 4 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 src/components/icons/NoDappsImage.tsx delete mode 100644 src/images/empty-dapps.png diff --git a/src/components/icons/NoDappsImage.tsx b/src/components/icons/NoDappsImage.tsx new file mode 100644 index 000000000..42c257086 --- /dev/null +++ b/src/components/icons/NoDappsImage.tsx @@ -0,0 +1,49 @@ +import Svg, { ClipPath, Defs, G, Path, SvgProps } from 'react-native-svg' + +import { sharedColors } from 'src/shared/constants' + +const NoDappsImage = (props: SvgProps) => ( + + + + + + + + + + + + + + + + +) +export default NoDappsImage diff --git a/src/images/empty-dapps.png b/src/images/empty-dapps.png deleted file mode 100644 index b7d3ec97615a310b818735e4c03476c60c2ccc40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31352 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 diff --git a/src/screens/walletConnect/index.tsx b/src/screens/walletConnect/index.tsx index 6e43bf3b8..6528e4742 100644 --- a/src/screens/walletConnect/index.tsx +++ b/src/screens/walletConnect/index.tsx @@ -25,6 +25,7 @@ import { castStyle } from 'shared/utils' import { changeTopColor } from 'store/slices/settingsSlice' import { useAppDispatch } from 'store/storeUtils' import { WalletContext } from 'shared/wallet' +import NoDappsImage from 'components/icons/NoDappsImage' import { DappItem } from './DappItem' import { @@ -148,10 +149,9 @@ export const WalletConnectScreen = ({ route }: Props) => { {wc2Sessions.length === 0 ? ( - + + + ) : ( {wc2Sessions.map(session => ( @@ -243,9 +243,8 @@ const styles = StyleSheet.create({ }), noDappsImage: castStyle.image({ flex: 4, - alignSelf: 'center', - width: '80%', - resizeMode: 'contain', + alignItems: 'center', + justifyContent: 'center', }), dappsList: castStyle.view({ flex: 1, diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 02a71e098..25681d2e6 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -40,6 +40,7 @@ export const sharedColors = { secondary: '#252525', accent: '#3A3A3A', highlight: '#575757', + light: '#FBFBFB', }, input: { From 8d8754c4097854dcbbd812c7394c728e15d47fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Mon, 25 Mar 2024 14:02:49 -0300 Subject: [PATCH 18/52] receive screen --- assets/svgs/rif_logo.svg | 13 ----- .../BarButtonGroup/BarButtonGroup.tsx | 6 +- src/navigation/index.tsx | 2 +- src/screens/receive/ReceiveScreen.tsx | 56 +++++-------------- 4 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 assets/svgs/rif_logo.svg diff --git a/assets/svgs/rif_logo.svg b/assets/svgs/rif_logo.svg deleted file mode 100644 index 4f8d73c05..000000000 --- a/assets/svgs/rif_logo.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/components/BarButtonGroup/BarButtonGroup.tsx b/src/components/BarButtonGroup/BarButtonGroup.tsx index 10fd0172f..f09d3905f 100644 --- a/src/components/BarButtonGroup/BarButtonGroup.tsx +++ b/src/components/BarButtonGroup/BarButtonGroup.tsx @@ -24,7 +24,11 @@ export const BarButtonGroupIcon = ({ onPress={onPress} style={styles.iconContainerStyle} accessibilityLabel={iconName}> - + ) diff --git a/src/navigation/index.tsx b/src/navigation/index.tsx index b09248c8e..aff78aeca 100644 --- a/src/navigation/index.tsx +++ b/src/navigation/index.tsx @@ -19,7 +19,7 @@ export const sharedHeaderLeftOptions = (goBack?: () => void) => ( onPress={goBack} style={sharedStyles.marginLeft24} accessibilityLabel="backButton"> - + ) diff --git a/src/screens/receive/ReceiveScreen.tsx b/src/screens/receive/ReceiveScreen.tsx index 0f1e206d9..ed65556ca 100644 --- a/src/screens/receive/ReceiveScreen.tsx +++ b/src/screens/receive/ReceiveScreen.tsx @@ -15,11 +15,12 @@ import { showMessage } from 'react-native-flash-message' import { shortAddress } from 'lib/utils' import { getAddressDisplayText, Input, Typography } from 'components/index' -import { sharedColors } from 'shared/constants' +import { sharedColors, sharedStyles } from 'shared/constants' import { QRGenerator } from 'components/QRGenerator/QRGenerator' import { PortfolioCard } from 'components/Porfolio/PortfolioCard' import { useAppSelector } from 'store/storeUtils' import { selectBalances } from 'store/slices/balancesSlice/selectors' +import { TokenBalanceObject } from 'store/slices/balancesSlice/types' import { MixedTokenAndNetworkType } from 'screens/send/types' import { selectBitcoin, selectChainId } from 'store/slices/settingsSlice' import { @@ -90,11 +91,6 @@ export const ReceiveScreen = ({ }) }, [address]) - const onChevronAssetShowTap = useCallback( - () => setShouldShowAssets(curr => !curr), - [], - ) - // Function to get the address const onGetAddress = useCallback( (asset: MixedTokenAndNetworkType) => { @@ -114,10 +110,8 @@ export const ReceiveScreen = ({ [rskAddress?.checksumAddress], ) - const onChangeSelectedAsset = useCallback( - asset => () => setSelectedAsset(asset), - [], - ) + const onChangeSelectedAsset = (asset: TokenBalanceObject) => () => + setSelectedAsset(asset) useEffect(() => { if (selectedAsset) { @@ -136,7 +130,7 @@ export const ReceiveScreen = ({ }, [username, t, navigation]) return ( - + {/* Change Asset Component */} @@ -144,13 +138,13 @@ export const ReceiveScreen = ({ setShouldShowAssets(curr => !curr)} style={styles.assetsChevronText} /> {shouldShowAssets && ( - + {Object.values(tokenBalances).map(asset => { const isSelected = selectedAsset !== undefined && @@ -232,7 +226,7 @@ export const ReceiveScreen = ({ @@ -249,28 +243,11 @@ export const ReceiveScreen = ({ } const styles = StyleSheet.create({ - parent: castStyle.view({ - backgroundColor: sharedColors.black, - flex: 1, - paddingHorizontal: 24, - }), - qrView: castStyle.view({ - paddingHorizontal: 35, - paddingVertical: 84, - borderRadius: 20, - marginTop: 5, - }), - headerStyle: castStyle.view({ - flexDirection: 'row', - justifyContent: 'space-between', - width: '100%', - marginVertical: 22.5, - }), emptyPadding: castStyle.view({ paddingVertical: 15, }), flexRow: castStyle.view({ - paddingTop: 18, + paddingTop: 30, flexDirection: 'row', justifyContent: 'space-between', paddingBottom: 10, @@ -285,18 +262,11 @@ const styles = StyleSheet.create({ marginTopView: castStyle.view({ marginTop: 20, }), - flexView: castStyle.view({ - flex: 1, - }), - flexCenter: castStyle.view({ - alignItems: 'center', - }), - width50View: castStyle.view({ - width: '50%', - }), assetsChevronText: castStyle.text({ width: '25%', textAlign: 'right', }), - usernameInput: castStyle.view({ marginTop: 30 }), + usernameInput: castStyle.view({ + marginTop: 30, + }), }) From dd5305a0cf38b34cbe298e910221dd319cf576d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Mon, 25 Mar 2024 17:16:14 -0300 Subject: [PATCH 19/52] text label --- src/components/accounts/AccountBox.tsx | 6 +++--- src/components/feedbackModal/index.tsx | 2 +- src/lib/i18n.ts | 6 +++--- src/screens/contacts/ContactDetails.tsx | 4 ++-- src/screens/home/TokenImage.tsx | 2 +- src/screens/profile/ProfileCreateScreen.tsx | 4 ++-- .../transactionSummary/TransactionSummaryComponent.tsx | 10 +++++----- src/shared/constants/index.ts | 1 - 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/components/accounts/AccountBox.tsx b/src/components/accounts/AccountBox.tsx index ef63f6dc4..dd9e31b48 100644 --- a/src/components/accounts/AccountBox.tsx +++ b/src/components/accounts/AccountBox.tsx @@ -108,7 +108,7 @@ export const AccountBox = ({ /> @@ -259,10 +259,10 @@ const styles = StyleSheet.create({ }), accountInput: castStyle.text({ - color: sharedColors.labelLight, + color: sharedColors.text.label, fontSize: 22, borderWidth: 1, - borderColor: sharedColors.labelLight, + borderColor: sharedColors.text.label, borderRadius: 5, paddingHorizontal: 5, paddingTop: 0, diff --git a/src/components/feedbackModal/index.tsx b/src/components/feedbackModal/index.tsx index 5b403a3c7..2a9ee583d 100644 --- a/src/components/feedbackModal/index.tsx +++ b/src/components/feedbackModal/index.tsx @@ -86,7 +86,7 @@ const styles = StyleSheet.create({ }), subtitle: castStyle.text({ marginTop: 5, - color: sharedColors.labelLight, + color: sharedColors.text.label, }), button: castStyle.view({ marginTop: 8, diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts index b01dde318..f3051c9d9 100644 --- a/src/lib/i18n.ts +++ b/src/lib/i18n.ts @@ -11,9 +11,9 @@ const resources = { device_compomised_description: 'Any "rooted" app can access your private keys and steal your funds. Wipe this wallet immediately and restore it on a secure device.', no_selected_wallet: 'No selected wallet', - address_copied_to_keyboard: 'Address copied to Clipboard', - mnemonic_copied: 'Mnemonic has been copied to Clipboard!', - message_copied_to_clipboard: 'Copied to Clipboard', + address_copied_to_keyboard: 'Address copied to clipboard', + mnemonic_copied: 'Mnemonic has been copied to clipboard!', + message_copied_to_clipboard: 'Copied to clipboard', ok: 'OK', back: 'Go Back', basic_row_pending: '• Pending', diff --git a/src/screens/contacts/ContactDetails.tsx b/src/screens/contacts/ContactDetails.tsx index faee1ab96..dc982e7c4 100644 --- a/src/screens/contacts/ContactDetails.tsx +++ b/src/screens/contacts/ContactDetails.tsx @@ -192,7 +192,7 @@ export const ContactDetails = ({ {contact.name} - + {contact.displayAddress || contact.address} @@ -231,7 +231,7 @@ export const ContactDetails = ({ {t('contacts_details_transactions')} diff --git a/src/screens/home/TokenImage.tsx b/src/screens/home/TokenImage.tsx index 5e5b3a3b3..2d1369d7c 100644 --- a/src/screens/home/TokenImage.tsx +++ b/src/screens/home/TokenImage.tsx @@ -24,7 +24,7 @@ export const TokenImage = ({ symbol, size = 18, transparent = false, - color = sharedColors.black, + color = sharedColors.background.primary, white, }: Props) => { let finalSymbol = symbol diff --git a/src/screens/profile/ProfileCreateScreen.tsx b/src/screens/profile/ProfileCreateScreen.tsx index c403c5491..a2f157641 100644 --- a/src/screens/profile/ProfileCreateScreen.tsx +++ b/src/screens/profile/ProfileCreateScreen.tsx @@ -184,7 +184,7 @@ export const ProfileCreateScreen = ({ accessibilityLabel={'username'}> {username || t('no_username')} - + {displayAddress} @@ -237,7 +237,7 @@ export const ProfileCreateScreen = ({ /> {t('profile_contact_details_subtitle')} diff --git a/src/screens/transactionSummary/TransactionSummaryComponent.tsx b/src/screens/transactionSummary/TransactionSummaryComponent.tsx index 989394139..47f4a6c67 100644 --- a/src/screens/transactionSummary/TransactionSummaryComponent.tsx +++ b/src/screens/transactionSummary/TransactionSummaryComponent.tsx @@ -183,12 +183,12 @@ export const TransactionSummaryComponent = ({ - + {formatTokenValues(fee.usdValue)} @@ -220,16 +220,16 @@ export const TransactionSummaryComponent = ({ {usdValue.symbol === '<' && Number(totalUsd) <= 0.01 && ( - + {'<'} )} - + {formatTokenValues(totalUsd)} diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 25681d2e6..1afb928b3 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -26,7 +26,6 @@ export const sharedColors = { dangerLight: '#ED6060', white: '#FFFFFF', borderColor: '#575757', - labelLight: '#B8B8B8', subTitle: '#FBFBFB', // tokenBackground: '#1E1E1E', black: '#000000', From 0b446e2f38677c65c1c22822929d04ff5385bf83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 01:23:11 -0300 Subject: [PATCH 20/52] domain input --- src/screens/rnsManager/DomainInput.tsx | 8 ++++---- src/shared/constants/index.ts | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/screens/rnsManager/DomainInput.tsx b/src/screens/rnsManager/DomainInput.tsx index cc9dc824e..cdd8dab96 100644 --- a/src/screens/rnsManager/DomainInput.tsx +++ b/src/screens/rnsManager/DomainInput.tsx @@ -39,8 +39,8 @@ const labelColorMap = new Map([ [DomainStatus.AVAILABLE, colors.green], [DomainStatus.TAKEN, colors.red], [DomainStatus.OWNED, colors.green], - [DomainStatus.NO_VALID, sharedColors.subTitle], - [DomainStatus.NONE, sharedColors.subTitle], + [DomainStatus.NO_VALID, sharedColors.text.placeholder], + [DomainStatus.NONE, sharedColors.text.placeholder], ]) export const DomainInput = ({ @@ -181,11 +181,11 @@ const styles = StyleSheet.create({ }), domainPlaceholder: castStyle.text({ fontSize: 14, - color: sharedColors.subTitle, + color: sharedColors.text.placeholder, }), domainSuffix: castStyle.text({ paddingRight: 10, - color: sharedColors.subTitle, + color: sharedColors.text.placeholder, }), errorText: castStyle.text({ color: colors.red, diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 1afb928b3..545fea73e 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -51,6 +51,7 @@ export const sharedColors = { primary: '#fff', secondary: '#000', label: '#B8B8B8', + placeholder: '#FBFBFB', link: '#4152E6', }, From 93b4d41417c62f47100c9ab3946f39fa01737507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 10:49:56 -0300 Subject: [PATCH 21/52] set default UserIcon params --- src/components/BasicRow/BasicRowWithContact.tsx | 8 +------- src/components/icons/UserIcon.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/BasicRow/BasicRowWithContact.tsx b/src/components/BasicRow/BasicRowWithContact.tsx index b96413e0b..29e900f4d 100644 --- a/src/components/BasicRow/BasicRowWithContact.tsx +++ b/src/components/BasicRow/BasicRowWithContact.tsx @@ -1,6 +1,5 @@ import { BasicRow, BasicRowProps } from 'components/BasicRow/index' import { Contact } from 'shared/types' -import { sharedColors } from 'shared/constants' import UserIcon from '../icons/UserIcon' @@ -16,12 +15,7 @@ export const BasicRowWithContact = ({ {...props} avatar={{ name: contact?.name, - icon: contact ? undefined : ( - - ), + icon: contact ? undefined : , }} /> ) diff --git a/src/components/icons/UserIcon.tsx b/src/components/icons/UserIcon.tsx index 73becbbd1..d89c862af 100644 --- a/src/components/icons/UserIcon.tsx +++ b/src/components/icons/UserIcon.tsx @@ -1,5 +1,7 @@ import Svg, { Path, Rect, SvgProps } from 'react-native-svg' +import { sharedColors } from 'shared/constants' + interface Props extends SvgProps { color?: string backgroundColor?: string @@ -8,8 +10,8 @@ interface Props extends SvgProps { export const UserIcon = ({ width = 44, height = 46, - color = '#B8B8B8', - backgroundColor = '#252525', + color = sharedColors.text.label, + backgroundColor = sharedColors.background.secondary, ...props }: Props) => ( From 90ae08983617aeddea65da4b514ed082c7825fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 10:54:16 -0300 Subject: [PATCH 22/52] adjustments --- src/components/avatar/index.tsx | 2 +- src/components/modal/index.tsx | 4 ++-- src/screens/send/TransactionForm.tsx | 1 - src/screens/walletConnect/index.tsx | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/avatar/index.tsx b/src/components/avatar/index.tsx index 3a6489b64..98d2a3127 100644 --- a/src/components/avatar/index.tsx +++ b/src/components/avatar/index.tsx @@ -32,7 +32,7 @@ export const Avatar = ({ name, letterColor, }: Props) => { - const halfSize = size / 2 + const halfSize = useMemo(() => size / 2, [size]) const firstCapital = useMemo(() => { if (name) { const letters = name.split('') diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index 359f85168..c46bb9d51 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -140,10 +140,10 @@ export const ConfirmationModal = ({ accessibilityLabel={'cancelText'} backgroundVariety={AppButtonBackgroundVarietyEnum.OUTLINED} color={ - buttons?.[1].color || sharedColors.button.secondaryBackground + buttons?.[1]?.color || sharedColors.button.secondaryBackground } textColor={ - buttons?.[1].textColor || sharedColors.button.secondaryText + buttons?.[1]?.textColor || sharedColors.button.secondaryText } /> )} diff --git a/src/screens/send/TransactionForm.tsx b/src/screens/send/TransactionForm.tsx index d26fccb80..dca37d833 100644 --- a/src/screens/send/TransactionForm.tsx +++ b/src/screens/send/TransactionForm.tsx @@ -136,7 +136,6 @@ export const TransactionForm = ({ return getDefaultFeeRelay(chainId) } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion return tokenList.find( tok => tok.contractAddress.toLowerCase() === contractAddress.toLowerCase(), diff --git a/src/screens/walletConnect/index.tsx b/src/screens/walletConnect/index.tsx index 6528e4742..5a3b6d375 100644 --- a/src/screens/walletConnect/index.tsx +++ b/src/screens/walletConnect/index.tsx @@ -3,7 +3,6 @@ import { ComponentType, useContext, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Alert, - Image, Keyboard, KeyboardAvoidingView, Platform, From e59372b0741688ab47e1c1a815fbb9d349a3bf17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 11:57:05 -0300 Subject: [PATCH 23/52] app spinner --- package.json | 2 +- src/components/button/index.tsx | 2 +- src/components/loading/LoadingScreen.tsx | 2 +- src/components/spinner/index.tsx | 2 +- src/screens/settings/RelayDeployScreen.tsx | 2 +- src/screens/walletConnect/AndroidQRScanner.tsx | 8 ++++++-- yarn.lock | 8 ++++---- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 52adbed63..6b2ce0bc2 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "react-native-screens": "^3.29.0", "react-native-screenshot-prevent": "^1.1.9", "react-native-ssl-public-key-pinning": "^1.1.3", - "react-native-svg": "^14.1.0", + "react-native-svg": "13.4.0", "react-native-vector-icons": "^10.0.3", "react-native-vision-camera": "^3.9.0", "react-redux": "^8.0.5", diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index 54b708249..99abaf7f0 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -153,7 +153,7 @@ export const AppButton = ({ ) : ( )} {rightIcon ? ( diff --git a/src/components/loading/LoadingScreen.tsx b/src/components/loading/LoadingScreen.tsx index d9abf2f15..e22fa605c 100644 --- a/src/components/loading/LoadingScreen.tsx +++ b/src/components/loading/LoadingScreen.tsx @@ -17,7 +17,7 @@ export const LoadingScreen = ({ isVisible }: Props) => { sharedStyles.contentCenter, styles.activityIndicatorViewStyle, ]}> - + ) diff --git a/src/components/spinner/index.tsx b/src/components/spinner/index.tsx index 40a79486a..ec3546da1 100644 --- a/src/components/spinner/index.tsx +++ b/src/components/spinner/index.tsx @@ -8,7 +8,7 @@ interface Props extends CircleSnailPropTypes { export const AppSpinner = ({ size, - color = sharedColors.white, + color = sharedColors.text.primary, thickness = size / 7, ...props }: Props) => { diff --git a/src/screens/settings/RelayDeployScreen.tsx b/src/screens/settings/RelayDeployScreen.tsx index e5a048338..3d988ae96 100644 --- a/src/screens/settings/RelayDeployScreen.tsx +++ b/src/screens/settings/RelayDeployScreen.tsx @@ -157,7 +157,7 @@ export const RelayDeployScreen = ({ ) : null} {loading ? ( - + - + {isProcessingImage ? ( ) : ( - + )} diff --git a/yarn.lock b/yarn.lock index 4609edfc1..69de72b0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10246,10 +10246,10 @@ react-native-ssl-public-key-pinning@^1.1.3: resolved "https://registry.yarnpkg.com/react-native-ssl-public-key-pinning/-/react-native-ssl-public-key-pinning-1.1.3.tgz#2dda6e751f4946550f0b12fa70c748305ba571f0" integrity sha512-9d1QQZEtY87wBldURCnhmnpUw4uMlvLfXhCoES3QkG+/TRdJ5vk55CVhb/FdE7v1JD5ye0m/PX09JBs/tSGWaA== -react-native-svg@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-14.1.0.tgz#7903bddd3c71bf3a8a503918253c839e6edaa724" - integrity sha512-HeseElmEk+AXGwFZl3h56s0LtYD9HyGdrpg8yd9QM26X+d7kjETrRQ9vCjtxuT5dCZEIQ5uggU1dQhzasnsCWA== +react-native-svg@13.4.0: + version "13.4.0" + resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-13.4.0.tgz#82399ba0956c454144618aa581e2d748dd3f010a" + integrity sha512-B3TwK+H0+JuRhYPzF21AgqMt4fjhCwDZ9QUtwNstT5XcslJBXC0FoTkdZo8IEb1Sv4suSqhZwlAY6lwOv3tHag== dependencies: css-select "^5.1.0" css-tree "^1.1.3" From 98b34dab8af9306e8fdf870fb8ea54e91a3c3194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 16:59:37 -0300 Subject: [PATCH 24/52] confirmation modal --- src/components/modal/index.tsx | 4 +--- src/screens/contacts/index.tsx | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx index c46bb9d51..bfb8807c8 100644 --- a/src/components/modal/index.tsx +++ b/src/components/modal/index.tsx @@ -139,9 +139,7 @@ export const ConfirmationModal = ({ onPress={onCancel} accessibilityLabel={'cancelText'} backgroundVariety={AppButtonBackgroundVarietyEnum.OUTLINED} - color={ - buttons?.[1]?.color || sharedColors.button.secondaryBackground - } + color={buttons?.[1]?.color || sharedColors.button.primaryBackground} textColor={ buttons?.[1]?.textColor || sharedColors.button.secondaryText } diff --git a/src/screens/contacts/index.tsx b/src/screens/contacts/index.tsx index adf0627dc..71b167afe 100644 --- a/src/screens/contacts/index.tsx +++ b/src/screens/contacts/index.tsx @@ -150,9 +150,7 @@ export const ContactsScreen = ({ navigation }: ContactsListScreenProps) => { onPress={() => navigation.navigate( contactsStackRouteNames.ContactDetails, - { - contact, - }, + { contact }, ) }> Date: Tue, 26 Mar 2024 18:03:30 -0300 Subject: [PATCH 25/52] avatar --- src/components/InfoBox/index.tsx | 21 ++++++++++++++++----- src/screens/profile/ProfileCreateScreen.tsx | 15 +++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/components/InfoBox/index.tsx b/src/components/InfoBox/index.tsx index 63aa436f1..cb8e4811b 100644 --- a/src/components/InfoBox/index.tsx +++ b/src/components/InfoBox/index.tsx @@ -14,6 +14,7 @@ interface InfoBoxProps { description?: string buttonText?: string onPress?: () => void + textColor?: string backgroundColor?: string avatarBackgroundColor?: string } @@ -24,8 +25,9 @@ export const InfoBox = ({ description, buttonText, onPress, - backgroundColor = sharedColors.background.secondary, - avatarBackgroundColor = sharedColors.qrColor, + textColor = sharedColors.text.primary, + backgroundColor = sharedColors.primary, + avatarBackgroundColor = sharedColors.text.secondary, }: InfoBoxProps) => { const [shouldHide, setShouldHide] = useState(false) const handleOnPress = useCallback(() => { @@ -47,22 +49,31 @@ export const InfoBox = ({ sharedStyles.marginBottom, { backgroundColor: avatarBackgroundColor }, ]} + letterColor={textColor} name={avatar} size={80} /> ) : null} {title ? ( - + {title} ) : null} {description ? ( - {description} + + {description} + ) : null} {buttonText ? ( - + {buttonText} diff --git a/src/screens/profile/ProfileCreateScreen.tsx b/src/screens/profile/ProfileCreateScreen.tsx index a2f157641..f23775011 100644 --- a/src/screens/profile/ProfileCreateScreen.tsx +++ b/src/screens/profile/ProfileCreateScreen.tsx @@ -175,12 +175,17 @@ export const ProfileCreateScreen = ({ {username ? ( ) : ( - + )} {username || t('no_username')} @@ -212,8 +217,6 @@ export const ProfileCreateScreen = ({ title={t('info_box_title_search_domain')} description={t('info_box_description_search_domain')} buttonText={t('info_box_close_button')} - backgroundColor={sharedColors.primary} - avatarBackgroundColor={sharedColors.secondary} onPress={closeInfoBox} /> ) : null} @@ -226,7 +229,7 @@ export const ProfileCreateScreen = ({ @@ -305,7 +308,7 @@ const styles = StyleSheet.create({ paddingLeft: 10, }), avatarBackground: castStyle.view({ - backgroundColor: sharedColors.white, + backgroundColor: sharedColors.text.primary, }), flexCenter: castStyle.view({ alignItems: 'center', From 7b9efa90b0146d92fc3011b1ef2a5aeaaaac8a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 18:17:00 -0300 Subject: [PATCH 26/52] account box --- src/components/accounts/AccountBox.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/accounts/AccountBox.tsx b/src/components/accounts/AccountBox.tsx index dd9e31b48..4da689daa 100644 --- a/src/components/accounts/AccountBox.tsx +++ b/src/components/accounts/AccountBox.tsx @@ -151,7 +151,7 @@ export const AccountBox = ({ Clipboard.setString(eoaAddressObject.checksumAddress || '') @@ -171,7 +171,7 @@ export const AccountBox = ({ Clipboard.setString( @@ -200,7 +200,7 @@ export const AccountBox = ({ Clipboard.setString(publicKey.publicKey || '')} /> From 680b384bb6691eb6af427d98883b481b78f4dc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 18:23:24 -0300 Subject: [PATCH 27/52] text link --- src/components/token/index.tsx | 4 ++-- src/screens/example/index.tsx | 6 +++++- src/shared/constants/index.ts | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/token/index.tsx b/src/components/token/index.tsx index d39c278d8..1b784aef1 100644 --- a/src/components/token/index.tsx +++ b/src/components/token/index.tsx @@ -268,10 +268,10 @@ const styles = StyleSheet.create({ alignItems: 'flex-start', }), nameContent: castStyle.text({ - color: sharedColors.primary, + color: sharedColors.text.link, }), addressContent: castStyle.text({ - color: sharedColors.primary, + color: sharedColors.text.link, paddingTop: 6, }), }) diff --git a/src/screens/example/index.tsx b/src/screens/example/index.tsx index af71a9d37..cd865cde3 100644 --- a/src/screens/example/index.tsx +++ b/src/screens/example/index.tsx @@ -53,7 +53,11 @@ export const ExampleScreen = ({ inputName={'ex2'} placeholder={'Example 2'} label={'Example 2'} - rightIcon={{ name: 'copy', size: 20, color: sharedColors.white }} + rightIcon={{ + name: 'copy', + size: 20, + color: sharedColors.text.primary, + }} /> Date: Tue, 26 Mar 2024 18:24:21 -0300 Subject: [PATCH 28/52] wallet backup --- src/screens/settings/WalletBackup.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/screens/settings/WalletBackup.tsx b/src/screens/settings/WalletBackup.tsx index 1b7db2182..e71c65757 100644 --- a/src/screens/settings/WalletBackup.tsx +++ b/src/screens/settings/WalletBackup.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { ScrollView, StyleSheet, View } from 'react-native' -import { sharedColors } from 'shared/constants' +import { sharedColors, sharedStyles } from 'shared/constants' import { MnemonicComponent, Typography } from 'components/index' import { SettingsScreenProps, @@ -31,7 +31,7 @@ export const WalletBackup = (_: Props) => { }, []) return ( - + {t('wallet_backup_subtitle')} @@ -43,10 +43,6 @@ export const WalletBackup = (_: Props) => { } const styles = StyleSheet.create({ - container: castStyle.view({ - backgroundColor: sharedColors.black, - paddingHorizontal: 24, - }), content: castStyle.view({ marginTop: 24, }), From 24cb6e44f1b335cc15b092e07807d4ac15cebc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 18:25:30 -0300 Subject: [PATCH 29/52] center no deploy image --- src/screens/settings/RelayDeployScreen.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/screens/settings/RelayDeployScreen.tsx b/src/screens/settings/RelayDeployScreen.tsx index 3d988ae96..19ed1f2b7 100644 --- a/src/screens/settings/RelayDeployScreen.tsx +++ b/src/screens/settings/RelayDeployScreen.tsx @@ -208,7 +208,12 @@ const styles = StyleSheet.create({ justifyContent: 'center', alignItems: 'center', }), - noDeployImage: castStyle.image({ height: 352, width: 232, marginTop: 38 }), + noDeployImage: castStyle.image({ + height: 352, + width: 232, + marginTop: 38, + alignSelf: 'center', + }), walletDeployedWrapper: castStyle.view({ flex: 1, justifyContent: 'center', From 582e3ef4ac0fa30c1fbbaec66e602ce56423f586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 18:29:36 -0300 Subject: [PATCH 30/52] onboard screen must have fixed colors instead --- src/screens/createKeys/CreateKeysScreen.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/screens/createKeys/CreateKeysScreen.tsx b/src/screens/createKeys/CreateKeysScreen.tsx index 8549a7459..a954f4e04 100644 --- a/src/screens/createKeys/CreateKeysScreen.tsx +++ b/src/screens/createKeys/CreateKeysScreen.tsx @@ -33,7 +33,10 @@ export const CreateKeysScreen = ({ {t('initial_screen_title')} - + {t('initial_screen_welcome_footer')} @@ -45,8 +48,8 @@ export const CreateKeysScreen = ({ } accessibilityLabel={'newWallet'} title={t('initial_screen_button_create')} - color={sharedColors.button.primaryBackground} - textColor={sharedColors.button.primaryText} + color={sharedColors.white} + textColor={sharedColors.black} /> From eecbafda5f6110b46059a614a00fdf467dab4098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 18:52:24 -0300 Subject: [PATCH 31/52] new master key screen --- .../new/ConfirmNewMasterKeyScreen.tsx | 33 ++++++++++++------- .../createKeys/new/NewMasterKeyScreen.tsx | 1 + 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/screens/createKeys/new/ConfirmNewMasterKeyScreen.tsx b/src/screens/createKeys/new/ConfirmNewMasterKeyScreen.tsx index df4271142..457fcf144 100644 --- a/src/screens/createKeys/new/ConfirmNewMasterKeyScreen.tsx +++ b/src/screens/createKeys/new/ConfirmNewMasterKeyScreen.tsx @@ -164,7 +164,7 @@ export const ConfirmNewMasterKeyScreen = ({ route }: ConfirmNewMasterKey) => { }, [hasFormSuccess, dispatch, mnemonic, initializeWallet]) return ( - + { textColor={sharedColors.button.primaryText} /> {!formIsValid || hasFormSuccess ? ( - + + color={sharedColors.text.primary}> {hasFormSuccess ? t('confirm_key_success') : t('confirm_key_error')} { } const styles = StyleSheet.create({ - screen: castStyle.view({ - flex: 1, - backgroundColor: sharedColors.black, - paddingHorizontal: 24, + titleText: castStyle.text({ + marginTop: 58, + letterSpacing: -0.3, + }), + center: castStyle.view({ + alignItems: 'center', }), - titleText: castStyle.text({ marginTop: 58, letterSpacing: -0.3 }), backgroundOverlay: castStyle.view({ - backgroundColor: sharedColors.black, + backgroundColor: sharedColors.background.primary, + }), + firstInputContainer: castStyle.view({ + marginTop: 32, }), - firstInputContainer: castStyle.view({ marginTop: 32 }), button: castStyle.view({ position: 'absolute', bottom: 30, left: 24, right: 24, }), - feedbackText: castStyle.text({ marginTop: 58, marginLeft: 24 }), - feedbackIcon: castStyle.text({ alignSelf: 'center', marginTop: 58 }), + feedbackText: castStyle.text({ + marginTop: 58, + marginLeft: 24, + }), + feedbackIcon: castStyle.text({ + alignSelf: 'center', + marginTop: 58, + }), }) diff --git a/src/screens/createKeys/new/NewMasterKeyScreen.tsx b/src/screens/createKeys/new/NewMasterKeyScreen.tsx index 84359b629..748aa440f 100644 --- a/src/screens/createKeys/new/NewMasterKeyScreen.tsx +++ b/src/screens/createKeys/new/NewMasterKeyScreen.tsx @@ -92,6 +92,7 @@ export const NewMasterKeyScreen = ({ navigation }: Props) => { backgroundVariety={AppButtonBackgroundVarietyEnum.OUTLINED} onPress={onSecureLater} accessibilityLabel={TestID.SecureLaterButton} + color={sharedColors.button.primaryBackground} /> From 1c8ac06fff30c3bd33f8e02971d37c03d6db3815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 19:41:54 -0300 Subject: [PATCH 32/52] GlobalErrorHandler --- .../GlobalErrorHandlerView.tsx | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/GlobalErrorHandler/GlobalErrorHandlerView.tsx b/src/components/GlobalErrorHandler/GlobalErrorHandlerView.tsx index 05edeb4e5..a9ff15dd6 100644 --- a/src/components/GlobalErrorHandler/GlobalErrorHandlerView.tsx +++ b/src/components/GlobalErrorHandler/GlobalErrorHandlerView.tsx @@ -21,13 +21,14 @@ const GlobalErrorHandlerView: React.FC = ({ }) => { const { handleReload, globalError } = useGlobalErrorContext() const { t } = useTranslation() - const messageToShow: string = message || globalError || '' + const messageToShow = message || globalError || '' const onCopyError = React.useCallback(() => { Clipboard.setString(messageToShow) }, [messageToShow]) + return ( - + = ({ {t('global_error_details_title')} @@ -58,11 +59,14 @@ const GlobalErrorHandlerView: React.FC = ({ onPress={onCopyError}> {t(messageToShow)} - + )} @@ -71,7 +75,8 @@ const GlobalErrorHandlerView: React.FC = ({ title={'reload'} accessibilityLabel={'reload'} onPress={handleReload} - style={styles.reload} + color={sharedColors.button.primaryBackground} + textColor={sharedColors.button.primaryText} /> @@ -109,12 +114,12 @@ const styles = StyleSheet.create({ alignItems: 'center', }), text: castStyle.text({ - color: sharedColors.white, + color: sharedColors.text.primary, marginBottom: 10, textAlign: 'center', }), errorDetailsTouch: castStyle.view({ - backgroundColor: colors.darkPurple5, + backgroundColor: sharedColors.background.secondary, height: 65, borderRadius: 17, padding: 10, @@ -135,10 +140,6 @@ const styles = StyleSheet.create({ height: undefined, aspectRatio: 1, }), - reload: castStyle.view({ - backgroundColor: colors.background.bustyBlue, - width: 150, - }), }) export default GlobalErrorHandlerView From 1ba5e2bfbff648e0dbe71f856054a5368e390979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Tue, 26 Mar 2024 20:20:25 -0300 Subject: [PATCH 33/52] dapp item --- src/screens/walletConnect/DappItem.tsx | 2 +- src/shared/constants/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/screens/walletConnect/DappItem.tsx b/src/screens/walletConnect/DappItem.tsx index 61cbe042e..7735a70c2 100644 --- a/src/screens/walletConnect/DappItem.tsx +++ b/src/screens/walletConnect/DappItem.tsx @@ -97,7 +97,7 @@ const styles = StyleSheet.create({ backgroundColor: sharedColors.warning, }), dappUrl: castStyle.text({ - color: sharedColors.qrColor, + color: sharedColors.text.placeholder, opacity: 0.6, }), dappButton: castStyle.image({ diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index c4a8bab22..503ed59cd 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -29,7 +29,7 @@ export const sharedColors = { // subTitle: '#FBFBFB', // tokenBackground: '#1E1E1E', black: '#000000', - qrColor: '#DBE3FF', + // qrColor: '#DBE3FF', errorBackground: '#FF3559', // lightPurple: '#DAE2FF', // blue: '#6053F8', From 632c8a15be6169c68ff7d3b99890f8b2837146a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 27 Mar 2024 01:09:03 -0300 Subject: [PATCH 34/52] app header adjustments --- src/navigation/homeNavigator/index.tsx | 2 +- src/navigation/index.tsx | 8 +++++--- src/navigation/rootNavigator/index.tsx | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/navigation/homeNavigator/index.tsx b/src/navigation/homeNavigator/index.tsx index fd51347ad..8da9b2e2e 100644 --- a/src/navigation/homeNavigator/index.tsx +++ b/src/navigation/homeNavigator/index.tsx @@ -26,7 +26,7 @@ export const HomeNavigator = ({ ({ + headerShown, header: props => , tabBarHideOnKeyboard: true, -} +}) export const headerStyles = StyleSheet.create({ headerStyle: castStyle.view({ diff --git a/src/navigation/rootNavigator/index.tsx b/src/navigation/rootNavigator/index.tsx index 87829537d..3465e73f4 100644 --- a/src/navigation/rootNavigator/index.tsx +++ b/src/navigation/rootNavigator/index.tsx @@ -57,7 +57,7 @@ export const RootNavigationComponent = () => { return ( (!isShown ? null : )}> + tabBar={props => (isShown ? : null)}> {!unlocked ? ( { /> ) : ( <> - + Date: Wed, 27 Mar 2024 10:23:34 -0300 Subject: [PATCH 35/52] move shared colors to a separate file --- src/core/config.ts | 2 +- .../import/ImportMasterKeyScreen.tsx | 2 +- src/screens/settings/SettingsScreen.tsx | 2 +- src/shared/constants/colors.ts | 51 +++++ src/shared/constants/index.ts | 185 +----------------- src/shared/constants/styles.ts | 131 +++++++++++++ 6 files changed, 189 insertions(+), 184 deletions(-) create mode 100644 src/shared/constants/colors.ts create mode 100644 src/shared/constants/styles.ts diff --git a/src/core/config.ts b/src/core/config.ts index bc6e51354..eb7aa593f 100644 --- a/src/core/config.ts +++ b/src/core/config.ts @@ -6,7 +6,7 @@ import { constants } from 'ethers' import { ChainID } from 'lib/eoaWallet' -import { chainTypesById } from 'shared/constants/chainConstants' +import { chainTypesById } from 'shared/constants' import { SETTINGS } from 'core/types' import { TokenSymbol } from 'screens/home/TokenImage' import { rbtcMap } from 'shared/utils' diff --git a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx index 257187186..516f20f07 100644 --- a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx +++ b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx @@ -48,7 +48,7 @@ const StatusIcon = ({ status }: { status: StatusActions }) => { backgroundColor: status === StatusActions.SUCCESS ? sharedColors.successLight - : sharedColors.errorBackground, + : sharedColors.error, borderRadius: 50, } switch (status) { diff --git a/src/screens/settings/SettingsScreen.tsx b/src/screens/settings/SettingsScreen.tsx index 8f2c5a47a..2bc0ac6d7 100644 --- a/src/screens/settings/SettingsScreen.tsx +++ b/src/screens/settings/SettingsScreen.tsx @@ -17,7 +17,7 @@ import { castStyle } from 'shared/utils' import { selectChainId } from 'store/slices/settingsSlice' import { selectPin } from 'store/slices/persistentDataSlice' import { useAppSelector } from 'store/storeUtils' -import { ChainTypeEnum, chainTypesById } from 'shared/constants/chainConstants' +import { ChainTypeEnum, chainTypesById } from 'shared/constants' import { GlobalErrorHandlerContext } from 'components/GlobalErrorHandler/GlobalErrorHandlerContext' import { getCurrentChainId, setCurrentChainId } from 'storage/ChainStorage' import { WalletContext } from 'shared/wallet' diff --git a/src/shared/constants/colors.ts b/src/shared/constants/colors.ts new file mode 100644 index 000000000..739cf4ddd --- /dev/null +++ b/src/shared/constants/colors.ts @@ -0,0 +1,51 @@ +export const sharedColors = { + primary: '#4B5CF0', + primaryDark: '#4250CC', // used over the primary color + secondary: '#121212', + success: '#79C600', + successLight: '#59FF9C', + connected: '#01CB9F', + warning: '#FF9100', + danger: '#E94141', + dangerLight: '#ED6060', + error: '#FF3559', + black: '#000000', + white: '#FFFFFF', + borderColor: '#575757', + background: { + primary: '#000', + secondary: '#252525', + accent: '#3A3A3A', + highlight: '#575757', + light: '#FBFBFB', + }, + input: { + active: '#3A3A3A', + inactive: '#252525', + }, + text: { + primary: '#fff', + secondary: '#000', + label: '#B8B8B8', + placeholder: '#FBFBFB', + link: '#4152E6', + }, + button: { + primaryBackground: '#fff', + primaryText: '#000', + secondaryBackground: '#252525', + secondaryText: '#fff', + }, + stepper: { + active: '#4B5CF0', + inactive: '#3A3A3A', + }, +} + +export const tokenColors = { + rbtc: '#71BD35', + btc: '#EB7D00', + rif: '#4152E6', + rdoc: '#11B55C', + generic: '#252525', +} diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index 503ed59cd..973c192cf 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -1,6 +1,8 @@ -import { Dimensions, StyleSheet } from 'react-native' +import { Dimensions } from 'react-native' -import { castStyle } from '../utils' +export { ChainTypeEnum, chainTypesById } from './chainConstants' +export { sharedColors, tokenColors } from './colors' +export { sharedStyles } from './styles' export const testIDs = { wordInput: 'input.wordInput', @@ -14,189 +16,10 @@ export const testIDs = { newContact: 'newContact', } -export const sharedColors = { - primary: '#4B5CF0', - primaryDark: '#4250CC', // used over the primary color - secondary: '#121212', - success: '#79C600', - successLight: '#59FF9C', - connected: '#01CB9F', - warning: '#FF9100', - danger: '#E94141', - dangerLight: '#ED6060', - white: '#FFFFFF', - borderColor: '#575757', - // subTitle: '#FBFBFB', - // tokenBackground: '#1E1E1E', - black: '#000000', - // qrColor: '#DBE3FF', - errorBackground: '#FF3559', - // lightPurple: '#DAE2FF', - // blue: '#6053F8', - - background: { - primary: '#000', - secondary: '#252525', - accent: '#3A3A3A', - highlight: '#575757', - light: '#FBFBFB', - }, - - input: { - active: '#3A3A3A', - inactive: '#252525', - }, - - text: { - primary: '#fff', - secondary: '#000', - label: '#B8B8B8', - placeholder: '#FBFBFB', - link: '#4152E6', - }, - - button: { - primaryBackground: '#fff', - primaryText: '#000', - secondaryBackground: '#252525', - secondaryText: '#fff', - }, - - stepper: { - active: '#4B5CF0', - inactive: '#3A3A3A', - }, -} - -export const tokenColors = { - rbtc: '#71BD35', - btc: '#EB7D00', - rif: '#4152E6', - rdoc: '#11B55C', - generic: '#252525', -} export const defaultFontSize = 16 export const defaultIconSize = 16 export const noop = () => {} -export const sharedStyles = StyleSheet.create({ - displayNone: castStyle.view({ - display: 'none', - }), - flex: castStyle.view({ - flex: 1, - }), - flexGrow: castStyle.view({ - flexGrow: 1, - }), - flexAlignEnd: castStyle.view({ - alignSelf: 'flex-end', - }), - row: castStyle.view({ - flexDirection: 'row', - }), - textCenter: castStyle.text({ - textAlign: 'center', - }), - textLeft: castStyle.text({ - textAlign: 'left', - }), - textRight: castStyle.text({ - textAlign: 'right', - }), - contentCenter: castStyle.view({ - justifyContent: 'center', - alignItems: 'center', - }), - alignCenter: castStyle.view({ - alignItems: 'center', - }), - marginLeft24: castStyle.view({ marginLeft: 24 }), - marginTop40: castStyle.view({ marginTop: 40 }), - marginRight24: castStyle.view({ marginRight: 24 }), - paddingHorizontal24: castStyle.view({ - paddingHorizontal: 24, - }), - screen: castStyle.view({ - flex: 1, - backgroundColor: sharedColors.background.primary, - paddingHorizontal: 24, - }), - noPadding: castStyle.view({ padding: 0 }), - selfCenter: castStyle.view({ - alignSelf: 'center', - }), - widthHalfWidth: castStyle.view({ - width: '50%', - }), - widthFullWidth: castStyle.view({ - width: '100%', - }), - fontBoldText: castStyle.text({ - fontWeight: 'bold', - }), - appButtonBottom: castStyle.view({ - position: 'absolute', - bottom: 30, - left: 24, - right: 24, - }), - /* GRID */ - column12: { - display: 'flex', - width: '100%', - }, - column10: { - display: 'flex', - width: '83.333%', - }, - column9: { - display: 'flex', - width: '75%', - }, - column8: { - display: 'flex', - width: '66.667%', - }, - column7: { - display: 'flex', - width: '56.667%', - }, - column6: { - display: 'flex', - width: '50%', - }, - column5: { - display: 'flex', - width: '41.667%', - }, - column4: { - display: 'flex', - width: '33%', - }, - column3: { - display: 'flex', - width: '25%', - }, - column2: { - display: 'flex', - width: '16.667%', - }, - column1: { - display: 'flex', - width: '8.333%', - }, - column: { - display: 'flex', - }, - - offset1: { - marginLeft: '8.3%', - }, - offset3: { - marginLeft: '25%', - }, -}) export const WINDOW_WIDTH = Dimensions.get('window').width export const WINDOW_HEIGHT = Dimensions.get('window').height export const SLIDER_WIDTH = Math.round(WINDOW_WIDTH * 0.8) diff --git a/src/shared/constants/styles.ts b/src/shared/constants/styles.ts new file mode 100644 index 000000000..4b5a7bcb0 --- /dev/null +++ b/src/shared/constants/styles.ts @@ -0,0 +1,131 @@ +import { StyleSheet } from 'react-native' + +import { sharedColors } from 'shared/constants' + +import { castStyle } from '../utils' + +export const sharedStyles = StyleSheet.create({ + displayNone: castStyle.view({ + display: 'none', + }), + flex: castStyle.view({ + flex: 1, + }), + flexGrow: castStyle.view({ + flexGrow: 1, + }), + flexAlignEnd: castStyle.view({ + alignSelf: 'flex-end', + }), + row: castStyle.view({ + flexDirection: 'row', + }), + textCenter: castStyle.text({ + textAlign: 'center', + }), + textLeft: castStyle.text({ + textAlign: 'left', + }), + textRight: castStyle.text({ + textAlign: 'right', + }), + contentCenter: castStyle.view({ + justifyContent: 'center', + alignItems: 'center', + }), + alignCenter: castStyle.view({ + alignItems: 'center', + }), + marginLeft24: castStyle.view({ + marginLeft: 24, + }), + marginTop40: castStyle.view({ + marginTop: 40, + }), + marginRight24: castStyle.view({ + marginRight: 24, + }), + paddingHorizontal24: castStyle.view({ + paddingHorizontal: 24, + }), + screen: castStyle.view({ + backgroundColor: sharedColors.background.primary, + paddingHorizontal: 24, + flex: 1, + }), + noPadding: castStyle.view({ + padding: 0, + }), + selfCenter: castStyle.view({ + alignSelf: 'center', + }), + widthHalfWidth: castStyle.view({ + width: '50%', + }), + widthFullWidth: castStyle.view({ + width: '100%', + }), + fontBoldText: castStyle.text({ + fontWeight: 'bold', + }), + appButtonBottom: castStyle.view({ + position: 'absolute', + bottom: 30, + left: 24, + right: 24, + }), + /* GRID */ + column12: { + display: 'flex', + width: '100%', + }, + column10: { + display: 'flex', + width: '83.333%', + }, + column9: { + display: 'flex', + width: '75%', + }, + column8: { + display: 'flex', + width: '66.667%', + }, + column7: { + display: 'flex', + width: '56.667%', + }, + column6: { + display: 'flex', + width: '50%', + }, + column5: { + display: 'flex', + width: '41.667%', + }, + column4: { + display: 'flex', + width: '33%', + }, + column3: { + display: 'flex', + width: '25%', + }, + column2: { + display: 'flex', + width: '16.667%', + }, + column1: { + display: 'flex', + width: '8.333%', + }, + column: { + display: 'flex', + }, + offset1: { + marginLeft: '8.3%', + }, + offset3: { + marginLeft: '25%', + }, +}) From c93ad077304452effdf0420cd15969ce216b5928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 27 Mar 2024 10:24:06 -0300 Subject: [PATCH 36/52] remove unused input shared color --- src/components/input/index.tsx | 2 +- src/screens/settings/WalletBackup.tsx | 2 +- src/shared/constants/colors.ts | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/input/index.tsx b/src/components/input/index.tsx index bed315ef7..3f5b3a5a6 100644 --- a/src/components/input/index.tsx +++ b/src/components/input/index.tsx @@ -221,7 +221,7 @@ const styles = StyleSheet.create({ minHeight: 80, }), containerActive: castStyle.view({ - backgroundColor: sharedColors.input.active, + backgroundColor: sharedColors.background.accent, }), contentPadding: castStyle.view({ paddingBottom: 18, diff --git a/src/screens/settings/WalletBackup.tsx b/src/screens/settings/WalletBackup.tsx index e71c65757..d4c722d71 100644 --- a/src/screens/settings/WalletBackup.tsx +++ b/src/screens/settings/WalletBackup.tsx @@ -2,12 +2,12 @@ import { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { ScrollView, StyleSheet, View } from 'react-native' -import { sharedColors, sharedStyles } from 'shared/constants' import { MnemonicComponent, Typography } from 'components/index' import { SettingsScreenProps, settingsStackRouteNames, } from 'navigation/settingsNavigator/types' +import { sharedStyles } from 'shared/constants' import { castStyle, usePreventScreenshot } from 'shared/utils' import { getKeys } from 'storage/SecureStorage' diff --git a/src/shared/constants/colors.ts b/src/shared/constants/colors.ts index 739cf4ddd..5d7589644 100644 --- a/src/shared/constants/colors.ts +++ b/src/shared/constants/colors.ts @@ -19,10 +19,6 @@ export const sharedColors = { highlight: '#575757', light: '#FBFBFB', }, - input: { - active: '#3A3A3A', - inactive: '#252525', - }, text: { primary: '#fff', secondary: '#000', From 8c4b75140624a70b0aa08079367188a32270e45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Santana=20Gon=C3=A7alves?= Date: Wed, 27 Mar 2024 19:33:29 -0300 Subject: [PATCH 37/52] remove unused CustomInput --- src/components/input/CustomInput.tsx | 94 ---------------------------- src/components/input/index.tsx | 2 - src/screens/home/index.tsx | 4 -- 3 files changed, 100 deletions(-) delete mode 100644 src/components/input/CustomInput.tsx diff --git a/src/components/input/CustomInput.tsx b/src/components/input/CustomInput.tsx deleted file mode 100644 index 86646bc2b..000000000 --- a/src/components/input/CustomInput.tsx +++ /dev/null @@ -1,94 +0,0 @@ -import React, { useEffect, useState } from 'react' -import { KeyboardTypeOptions, StyleSheet, TextInput, View } from 'react-native' - -import { Button } from '../button' -import { colors } from '../../styles' - -export const CustomInput: React.FC<{ - onChange?: (text: string) => void - onSubmit?: (text: string) => void - placeholder?: string - testID?: string - keyboardType?: KeyboardTypeOptions - value?: string -}> = ({ onChange, onSubmit, placeholder, testID, keyboardType, value }) => { - const [text, setText] = useState(value ?? '') - - const handleSubmit = () => { - if (!onSubmit) { - return - } - onSubmit(text) - } - - const handleChange = (textEntry: string) => { - setText(textEntry) - if (onChange) { - onChange(textEntry) - } - } - - useEffect(() => { - if (value !== undefined) { - setText(value) - } - }, [value]) - - return ( - - - - - {onSubmit && ( - -