Skip to content

fix(ToS): [IOPID-2989] Fix onboarding ToS scrolling #6958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 12, 2025
Merged

fix(ToS): [IOPID-2989] Fix onboarding ToS scrolling #6958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a666b4a
fix: onboarding tos scrolling
shadowsheep1 May 7, 2025
f6b7864
chore: use useFooterActionsMeasurements
shadowsheep1 May 7, 2025
6b69abc
chore: update TosWebComponent snapshot
shadowsheep1 May 7, 2025
67c2e95
Merge branch 'master' into IOPID-2989
shadowsheep1 May 7, 2025
8a83561
Merge branch 'master' into IOPID-2989
dmnplb May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions ts/features/settings/privacy/shared/components/TosWebviewComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { FooterActions } from "@pagopa/io-app-design-system";
import {
FooterActions,
useFooterActionsMeasurements
} from "@pagopa/io-app-design-system";
import * as E from "fp-ts/lib/Either";
import { pipe } from "fp-ts/lib/function";
import { FunctionComponent, memo, useCallback, useState } from "react";
Expand Down Expand Up @@ -36,6 +39,11 @@ const TosWebviewComponent: FunctionComponent<Props> = ({
}: Props) => {
const [hasError, setHasError] = useState(false);

const showFooter = shouldRenderFooter && onAcceptTos;

const { footerActionsMeasurements, handleFooterActionsMeasurements } =
useFooterActionsMeasurements();

const handleError = useCallback(() => {
handleLoadEnd();
setHasError(true);
Expand Down Expand Up @@ -65,7 +73,15 @@ const TosWebviewComponent: FunctionComponent<Props> = ({
<TosWebviewErrorComponent handleRetry={handleRetry} />
) : (
<>
<View style={{ flex: 1 }} testID="toSWebViewContainer">
<View
style={{
flex: 1,
paddingBottom: showFooter
? footerActionsMeasurements.safeBottomAreaHeight
: 0
}}
testID="toSWebViewContainer"
>
<WebView
androidCameraAccessDisabled={true}
androidMicrophoneAccessDisabled={true}
Expand All @@ -81,8 +97,10 @@ const TosWebviewComponent: FunctionComponent<Props> = ({
)}
/>
</View>
{shouldRenderFooter && onAcceptTos && (
{showFooter && (
<FooterActions
transparent
onMeasure={handleFooterActionsMeasurements}
actions={{
type: "SingleButton",
primary: {
Expand Down
1 change: 1 addition & 0 deletions ...ttings/privacy/shared/components/__test__/__snapshots__/TosWebviewComponent.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ exports[`TosWebviewComponent The snapshot for the TosWebviewComponent Should ren
style={
{
"flex": 1,
"paddingBottom": 0,
}
}
testID="toSWebViewContainer"
Expand Down
Loading