From 895000ac32121ec8f3f60aa2912ea5e4e63f87d1 Mon Sep 17 00:00:00 2001 From: minibits-cash Date: Thu, 10 Apr 2025 15:36:08 +0200 Subject: [PATCH] Fix placeholder text color --- src/screens/ContactDetailScreen.tsx | 2 ++ src/screens/Contacts/PublicContacts.tsx | 3 +++ src/screens/ImportBackupScreen.tsx | 3 +++ src/screens/MintsScreen.tsx | 4 ++++ src/screens/NwcScreen.tsx | 3 +++ src/screens/OwnKeysScreen.tsx | 3 +++ src/screens/Recovery/MnemonicInput.tsx | 4 +++- src/screens/RelaysScreen.tsx | 2 ++ src/screens/TopupScreen.tsx | 2 +- src/screens/TranDetailScreen.tsx | 2 ++ 10 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/screens/ContactDetailScreen.tsx b/src/screens/ContactDetailScreen.tsx index d2c98d28..918d25a5 100644 --- a/src/screens/ContactDetailScreen.tsx +++ b/src/screens/ContactDetailScreen.tsx @@ -180,6 +180,7 @@ export const ContactDetailScreen = observer(function ({ route }: Props) { const mainButtonIcon = useThemeColor('mainButtonIcon') const mainButtonText = useThemeColor('text') const inputText = useThemeColor('text') + const placeholderTextColor = useThemeColor('textDim') const {type, name, display_name, npub, nip05, picture, about, lud16} = contact @@ -227,6 +228,7 @@ export const ContactDetailScreen = observer(function ({ route }: Props) { keyboardType="default" selectTextOnFocus={true} placeholder={translate("privateNotePlaceholder")} + placeholderTextColor={placeholderTextColor} editable={ isNoteEditing ? true diff --git a/src/screens/Contacts/PublicContacts.tsx b/src/screens/Contacts/PublicContacts.tsx index 1a551535..1d668590 100644 --- a/src/screens/Contacts/PublicContacts.tsx +++ b/src/screens/Contacts/PublicContacts.tsx @@ -432,6 +432,7 @@ export const PublicContacts = observer(function (props: { const insets = useSafeAreaInsets() const inputBg = useThemeColor('background') const inputText = useThemeColor('text') + const placeholderTextColor = useThemeColor('textDim') return ( @@ -563,6 +564,7 @@ export const PublicContacts = observer(function (props: { keyboardType='default' maxLength={64} placeholder='npub...' + placeholderTextColor={placeholderTextColor} selectTextOnFocus={true} style={[$npubInput, {backgroundColor: inputBg, color: inputText},]} /> @@ -601,6 +603,7 @@ export const PublicContacts = observer(function (props: { keyboardType='default' maxLength={64} placeholder='wss://...' + placeholderTextColor={placeholderTextColor} selectTextOnFocus={true} style={[$npubInput, {backgroundColor: inputBg, color: inputText},]} /> diff --git a/src/screens/ImportBackupScreen.tsx b/src/screens/ImportBackupScreen.tsx index 52cb3a04..21839ede 100644 --- a/src/screens/ImportBackupScreen.tsx +++ b/src/screens/ImportBackupScreen.tsx @@ -318,6 +318,7 @@ export const ImportBackupScreen = observer(function ImportBackupScreen({ route } setStatusMessage(translate('recovery.completed')) // go directly to the wallet (profile hase been rehydrated from the one with the seed) + // @ts-ignore navigation.navigate('Tabs') await delay(1000) setStatusMessage('') @@ -339,6 +340,7 @@ export const ImportBackupScreen = observer(function ImportBackupScreen({ route } const inputBg = useThemeColor('background') const loadingBg = useThemeColor('background') const headerTitle = useThemeColor('headerTitle') + const placeholderTextColor = useThemeColor('textDim') if(mnemonicExists) { return ( @@ -413,6 +415,7 @@ export const ImportBackupScreen = observer(function ImportBackupScreen({ route } autoCapitalize='none' keyboardType='default' placeholder={'Paste your backup'} + placeholderTextColor={placeholderTextColor} selectTextOnFocus={true} style={[$backupInput, {backgroundColor: inputBg, flexWrap: 'wrap', color: inputText}]} /> diff --git a/src/screens/MintsScreen.tsx b/src/screens/MintsScreen.tsx index 9470e340..c71f79de 100644 --- a/src/screens/MintsScreen.tsx +++ b/src/screens/MintsScreen.tsx @@ -86,12 +86,14 @@ export const MintsScreen = observer(function MintsScreen({ route }: Props) { const gotoScan = function () { toggleAddMintModal() + // @ts-ignore navigation.navigate('Scan', {unit: userSettingsStore.preferredUnit}) } const gotoInfo = function () { if(!selectedMint) {return} + // @ts-ignore navigation.navigate('MintInfo', {mintUrl: selectedMint?.mintUrl}) onMintUnselect() } @@ -287,6 +289,7 @@ export const MintsScreen = observer(function MintsScreen({ route }: Props) { const inputText = useThemeColor('text') const headerTitle = useThemeColor('headerTitle') const buttonBorder = useThemeColor('card') + const placeholderTextColor = useThemeColor('textDim') return ( @@ -434,6 +437,7 @@ export const MintsScreen = observer(function MintsScreen({ route }: Props) { style={[$mintInput, {backgroundColor: inputBg, color: inputText}]} maxLength={200} placeholder='https://' + placeholderTextColor={placeholderTextColor} />