Fix Issues

This commit is contained in:
KoalaSat 2023-11-19 00:01:34 +01:00
parent fbef7422a7
commit c20925fc31
No known key found for this signature in database
GPG Key ID: 2F7F61C6146AB157
13 changed files with 24 additions and 10 deletions

View File

@ -4,6 +4,7 @@
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="android:navigationBarColor">#405AA9</item>
</style>
</resources>

View File

@ -70,7 +70,8 @@
"Send": "Senden",
"Relays": "Relays",
"ProfileConfig": "Mein Profil",
"markAllRead": "Alle als gelesen markieren"
"markAllRead": "Alle als gelesen markieren",
"ProfileActions": "Actions"
},
"searchPage": {
"placeholder": "Suche nach öffentlichen Schlüsseln, Notizen, hashtags...",

View File

@ -61,7 +61,8 @@
"Send": "Send",
"Relays": "Relays",
"ProfileConfig": "My profile",
"markAllRead": "Mark all as read"
"markAllRead": "Mark all as read",
"ProfileActions": "Actions"
},
"searchPage": {
"placeholder": "Look for public keys, notes, hashtags...",

View File

@ -80,7 +80,8 @@
"Send": "Send",
"Relays": "Relays",
"ProfileConfig": "Mi perfil",
"markAllRead": "Marcar todo como leído"
"markAllRead": "Marcar todo como leído",
"ProfileActions": "Acciones"
},
"conversationPage": {
"unableDecypt": "{{username}} está hablando con otros sobre ti",

View File

@ -80,7 +80,8 @@
"Send": "Envoyer",
"Relays": "Relais",
"ProfileConfig": "Mon profil",
"markAllRead": "Mark all as read"
"markAllRead": "Mark all as read",
"ProfileActions": "Actions"
},
"groupHeaderIcon": {
"delete": "Leave group",

View File

@ -80,7 +80,8 @@
"Send": "Отпраить",
"Relays": "Реле",
"ProfileConfig": "Мой профиль",
"markAllRead": "Mark all as read"
"markAllRead": "Mark all as read",
"ProfileActions": "Actions"
},
"groupHeaderIcon": {
"delete": "Leave group",

View File

@ -79,7 +79,8 @@
"Config": "设置",
"Send": "发送",
"Relays": "中继",
"ProfileConfig": "简介设置"
"ProfileConfig": "简介设置",
"ProfileActions": "Actions"
},
"groupHeaderIcon": {
"delete": "退出",

View File

@ -431,7 +431,9 @@ export const ConversationPage: React.FC<ConversationPageProps> = ({ route }) =>
label={t('conversationPage.typeMessage') ?? ''}
value={input}
onChangeText={setInput}
onFocus={() => scrollViewRef.current?.scrollToEnd({ animated: true })}
onFocus={() => {
if (directMessages.length > 0) scrollViewRef.current?.scrollToEnd({ animated: true })}
}
left={
<TextInput.Icon
icon={() => (

View File

@ -105,6 +105,7 @@ export const HomeNavigator: React.FC = () => {
screenOptions={({ navigation }) => {
return {
detachPreviousScreen: !navigation.isFocused(),
navigationBarColor: '#405AA9',
cardStyleInterpolator,
header: (headerData) => {
const { navigation, route, back } = headerData

View File

@ -129,6 +129,7 @@ export const HomeNavigator: React.FC = () => {
screenOptions={({ navigation }) => {
return {
detachPreviousScreen: !navigation.isFocused(),
navigationBarColor: '#405AA9',
cardStyleInterpolator,
header: ({ navigation, route, back }) => {
const leftAction: () => JSX.Element = () => {

View File

@ -47,7 +47,7 @@ export const ConversationsFeed: React.FC = () => {
const { database, refreshBottomBarAt, qrReader, setQrReader } = useContext(AppContext)
const [pageSize, setPageSize] = useState<number>(initialPageSize)
const { publicKey, privateKey } = useContext(UserContext)
const { relayPool, lastEventId } = useContext(RelayPoolContext)
const { relayPool, lastEventId, setNewDirectMessages } = useContext(RelayPoolContext)
const [directMessages, settDirectMessages] = useState<DirectMessage[]>([])
const [sendPubKeyInput, setSendPubKeyInput] = useState<string>('')
const [users, setUsers] = useState<User[]>()
@ -69,6 +69,7 @@ export const ConversationsFeed: React.FC = () => {
)
useEffect(() => {
setNewDirectMessages(false)
loadDirectMessages(false)
}, [lastEventId, refreshBottomBarAt])

View File

@ -43,7 +43,7 @@ export const GroupsFeed: React.FC = () => {
const theme = useTheme()
const { database, qrReader, setQrReader, refreshBottomBarAt } = useContext(AppContext)
const { publicKey } = useContext(UserContext)
const { relayPool, lastEventId, lastConfirmationtId, sendEvent } = useContext(RelayPoolContext)
const { relayPool, lastEventId, lastConfirmationtId, sendEvent, setNewGroupMessages } = useContext(RelayPoolContext)
const bottomSheetSearchRef = React.useRef<RBSheet>(null)
const bottomSheetCreateRef = React.useRef<RBSheet>(null)
const bottomSheetFabActionRef = React.useRef<RBSheet>(null)
@ -70,6 +70,7 @@ export const GroupsFeed: React.FC = () => {
)
useEffect(() => {
setNewGroupMessages(false)
loadGroups()
}, [lastEventId, lastConfirmationtId, refreshBottomBarAt])

View File

@ -34,7 +34,7 @@ export const NotificationsFeed: React.FC = () => {
const { t } = useTranslation('common')
const { database, setNotificationSeenAt, pushedTab, getSatoshiSymbol } = useContext(AppContext)
const { publicKey, reloadLists, mutedEvents, mutedUsers } = useContext(UserContext)
const { lastEventId, relayPool } = useContext(RelayPoolContext)
const { lastEventId, relayPool, setNewNotifications } = useContext(RelayPoolContext)
const [notifications, setNotifications] = useState<Notification[]>([])
const [refreshing, setRefreshing] = useState(true)
const flashListRef = React.useRef<FlashList<Note>>(null)
@ -59,6 +59,7 @@ export const NotificationsFeed: React.FC = () => {
loadNotes()
reloadLists()
setRefreshing(false)
setNewNotifications(false)
}, [lastEventId])
useEffect(() => {