diff --git a/app/screens/home-screen/home-screen.tsx b/app/screens/home-screen/home-screen.tsx index 40a0bd2300..343272c19b 100644 --- a/app/screens/home-screen/home-screen.tsx +++ b/app/screens/home-screen/home-screen.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { useMemo } from "react" -import { RefreshControl, View, Alert, Dimensions, LayoutChangeEvent } from "react-native" +import { RefreshControl, View, Alert } from "react-native" import { ScrollView, TouchableOpacity, @@ -239,19 +239,7 @@ export const HomeScreen: React.FC = () => { } | undefined = undefined - const [noOfTransactionsToShow, setTransactionsToShow] = React.useState(1) - - const onLayoutTransactionDataWrapper = (e: LayoutChangeEvent) => { - if (loading) return - const layout = e.nativeEvent.layout - const txItemsToShow = Math.floor( - (Dimensions.get("screen").height - - (layout.y + layout.height) - - 180) /* Bottom Tab Navigation */ / - 80 /* Per Transaction Item */, - ) - if (noOfTransactionsToShow < txItemsToShow) setTransactionsToShow(txItemsToShow) - } + const TRANSACTIONS_TO_SHOW = 1 if (isAuthed && transactions.length > 0) { recentTransactionsData = { @@ -259,7 +247,7 @@ export const HomeScreen: React.FC = () => { details: ( <> {transactions - .slice(0, noOfTransactionsToShow) + .slice(0, TRANSACTIONS_TO_SHOW) .map( (tx, index, array) => tx && ( @@ -395,9 +383,7 @@ export const HomeScreen: React.FC = () => { ))} - - - + {recentTransactionsData && ( <> { )} + { diff --git a/app/screens/notification-history-screen/notification.tsx b/app/screens/notification-history-screen/notification.tsx index 2f821d7a09..676d076818 100644 --- a/app/screens/notification-history-screen/notification.tsx +++ b/app/screens/notification-history-screen/notification.tsx @@ -1,7 +1,6 @@ import { StatefulNotification, StatefulNotificationsDocument, - UnacknowledgedNotificationCountDocument, useStatefulNotificationAcknowledgeMutation, } from "@app/graphql/generated" import { Text, makeStyles } from "@rneui/themed" @@ -37,10 +36,7 @@ export const Notification: React.FC = ({ const [ack, _] = useStatefulNotificationAcknowledgeMutation({ variables: { input: { notificationId: id } }, - refetchQueries: [ - StatefulNotificationsDocument, - UnacknowledgedNotificationCountDocument, - ], + refetchQueries: [StatefulNotificationsDocument], }) const linkTo = useLinkTo()