Revert "chore: transaction list home screen adaptive to screen size (G…

…aloyMoney#3241)" (GaloyMoney#3242) This reverts commit 7e8deb5.
marcoleder · May 1, 2024 · 62c5d3d · 62c5d3d
1 parent 7e8deb5
commit 62c5d3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 23 deletions.
diff --git 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,27 +239,15 @@ 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 = {
       title: LL.TransactionScreen.title(),
       details: (
         <>
           {transactions
-            .slice(0, noOfTransactionsToShow)
+            .slice(0, TRANSACTIONS_TO_SHOW)
             .map(
               (tx, index, array) =>
                 tx && (
@@ -395,9 +383,7 @@ export const HomeScreen: React.FC = () => {
           ))}
         </View>
         <NotificationCard />
-        <AppUpdate />
-
-        <View onLayout={onLayoutTransactionDataWrapper}>
+        <View>
           {recentTransactionsData && (
             <>
               <TouchableOpacity
@@ -419,6 +405,7 @@ export const HomeScreen: React.FC = () => {
           )}
         </View>
 
+        <AppUpdate />
         <SetDefaultAccountModal
           isVisible={setDefaultAccountModalVisible}
           toggleModal={() => {

diff --git 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<StatefulNotification> = ({
 
   const [ack, _] = useStatefulNotificationAcknowledgeMutation({
     variables: { input: { notificationId: id } },
-    refetchQueries: [
-      StatefulNotificationsDocument,
-      UnacknowledgedNotificationCountDocument,
-    ],
+    refetchQueries: [StatefulNotificationsDocument],
   })
 
   const linkTo = useLinkTo()