diff --git a/packages/app/src/components/ImpactButton.tsx b/packages/app/src/components/ImpactButton.tsx index 4e3d7c51..9155edea 100644 --- a/packages/app/src/components/ImpactButton.tsx +++ b/packages/app/src/components/ImpactButton.tsx @@ -31,7 +31,7 @@ const styles = StyleSheet.create({ backgroundColor: Colors.purple[200], color: Colors.purple[100], position: 'absolute', - bottom: 5, + bottom: 0, paddingVertical: 8, }, desktopButton: { diff --git a/packages/app/src/components/Layout/Layout.tsx b/packages/app/src/components/Layout/Layout.tsx index f596f2a2..876b8633 100644 --- a/packages/app/src/components/Layout/Layout.tsx +++ b/packages/app/src/components/Layout/Layout.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import Header from '../Header/Header'; -import { Platform, ScrollView, StyleSheet, useWindowDimensions, View } from 'react-native'; +import { Platform, ScrollView, StyleSheet, View } from 'react-native'; import ImpactButton from '../ImpactButton'; import { useLocation } from 'react-router-native'; import { Colors } from '../../utils/colors'; @@ -9,6 +9,7 @@ import { useMediaQuery } from 'native-base'; import useCrossNavigate from '../../routes/useCrossNavigate'; import Breadcrumb, { BreadcrumbPathEntry } from './Breadcrumb'; import { DesktopPageContentContainer } from './DesktopPageContentContainer'; +import { useSafeAreaFrame } from 'react-native-safe-area-context'; interface LayoutProps { children: ReactNode; @@ -16,8 +17,9 @@ interface LayoutProps { } function Layout({ children, breadcrumbPath }: LayoutProps) { - const windowDimensions = useWindowDimensions(); - const scrollViewHeight = windowDimensions.height - 100; + const { height: safeAreaHeight } = useSafeAreaFrame(); + const scrollViewHeight = safeAreaHeight - 105; + const { address } = useAccount(); const [isDesktopResolution] = useMediaQuery({ minWidth: 920, @@ -36,7 +38,7 @@ function Layout({ children, breadcrumbPath }: LayoutProps) { const scrollViewStyles = [ styles.scrollView, - { maxHeight: scrollViewHeight }, + { maxHeight: scrollViewHeight, minHeight: scrollViewHeight }, { paddingBottom: isCollectivePage ? 61 : 0 }, ]; diff --git a/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts b/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts index 25762b6b..649d6a08 100644 --- a/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts +++ b/packages/app/src/hooks/useContractCalls/useDeleteFlow.ts @@ -37,7 +37,7 @@ export function useDeleteFlow( try { const sdk = new GoodCollectiveSDK(chainIdString, signer.provider, { network }); toggleStopDonationModal(true); - const tx = await sdk.deleteFlow(signer, collective, flowRate); + const tx = await sdk.deleteFlow(signer, collective, '0'); await tx.wait(); navigate(`/profile/${address}`); return;