fix: Add policy pages #1731

usame-algan · 2023-03-03T10:19:10Z

What it solves

Resolves #1722

How this PR fixes it

Adds a new page for Privacy policy, Cookie policy, Terms and Imprint
Links those pages in the footer
Displays the footer on those pages
Hides the sidebar on those pages
Shows a one time terms popup for users who have previously dismissed the cookie banner (existing users)

How to test it

Open the Safe
Observe a Terms banner showing up in the bottom corner
Open the Safe in a private tab and observe only the cookie banner showing
Accept the cookie banner and observe the Terms banner not showing up
Reload the page and observe the Terms banner not showing up
Go to Settings to see the Footer
Click on any of the three links to see the page
Compare to https://www.notion.so/gnosis-safe/Terms-policy-update-f3827a6f724340deae9554d24afe8c29
Create or Load a new safe and click on terms of use or privacy policy and observe seeing the new pages

Screenshots

github-actions · 2023-03-03T10:19:24Z

Branch preview

✅ Deploy successful!

https://add_policy_pages--webcore.review-web-core.5afe.dev

github-actions · 2023-03-03T10:20:25Z

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	0	0
Ignored	0	N/A

Result: ✅ success
Annotations: 0 total

^{Report generated by eslint-plus-action}

iamacook · 2023-03-03T10:38:59Z

src/components/common/TermsBanner/index.tsx

+        We updated our Terms and Conditions. Review the new terms{' '}
+        <Link href={AppRoutes.terms} passHref>
+          <MUILink color="success.main"> here</MUILink>


Suggested change

We updated our Terms and Conditions. Review the new terms{' '}

<Link href={AppRoutes.terms} passHref>

<MUILink color="success.main"> here</MUILink>

We've updated our Terms and Conditions. You can review them{' '}

<Link href={AppRoutes.terms} passHref>

<MUILink color="success.main">here</MUILink>.

iamacook · 2023-03-03T10:40:06Z

src/components/cookie-policy/index.tsx

+        <Link href={AppRoutes.privacy} passHref>
+          <MUILink>Privacy Policy</MUILink>
+        </Link>
+        , For general web-browsing of this website, your personal data is not revealed to us, although certain


Suggested change

, For general web-browsing of this website, your personal data is not revealed to us, although certain

, for general web-browsing of this website, your personal data is not revealed to us, although certain

katspaugh · 2023-03-03T13:26:01Z

src/components/privacy/index.tsx

+  return (
+    <div>
+      <h1>Privacy Policy</h1>
+      <p>Last updated on March&nbsp;2023.</p>


Suggested change

<p>Last updated on March 2023.</p>

<p>Last updated on the 6th of March 2023.</p>

Otherwise, the preposition should be in.

katspaugh · 2023-03-03T13:26:54Z

Please also bump the minor version in package.json.

francovenica · 2023-03-03T14:06:50Z

LGTM

tschubotz · 2023-03-03T16:12:22Z

When opening for the first time, the cookie banner comes up. The link to the cookie policy is https://safe.global/cookie instead of https://app.safe.global/cookie

tschubotz · 2023-03-03T16:13:46Z

will new users (i.e. users who have never been on the page before) also get this?

(Ideally it would only be displayed to existing users. If we don't have a nice way of determining existing users, I'd say users that have at least 1 safe added.)

tschubotz · 2023-03-03T16:15:42Z

I know this wasn't specified anywhere, but I think eventually we should move the licenses also to the app subdomain since it affects the apps only and doesn't make sense on the landing page. Where is the best spot to create an issue for this?

src/components/common/TermsBanner/index.tsx

usame-algan · 2023-03-06T08:26:55Z

I know this wasn't specified anywhere, but I think eventually we should move the licenses also to the app subdomain since it affects the apps only and doesn't make sense on the landing page. Where is the best spot to create an issue for this?

I've created a new issue on the web-core board #1737

will new users (i.e. users who have never been on the page before) also get this?

Yes, the Banner would be shown to all users until they click it away.

tschubotz · 2023-03-06T08:31:39Z

will new users (i.e. users who have never been on the page before) also get this?

Yes, the Banner would be shown to all users until they click it away.

@usame-algan Is there a way to limit the terms update banner to only existing users?

(If not, am I right to assume that we would leave this up for e.g. 1 month and then disable it again? Would be weird to have this banner up until the end of time.)

iamacook · 2023-03-06T09:01:28Z

@usame-algan Is there a way to limit the terms update banner to only existing users?

We could check the presence of the cookie preferences in localStorage. If the user previously (dis-)agreed to cookies, the key will be there.

…r, revert e2e test changes

usame-algan · 2023-03-06T09:34:01Z

@usame-algan Is there a way to limit the terms update banner to only existing users?

We could check the presence of the cookie preferences in localStorage. If the user previously (dis-)agreed to cookies, the key will be there.

I've changed it so that the Terms banner is only shown if a user previously dismissed the cookie banner. This should cover most existing users.

(If not, am I right to assume that we would leave this up for e.g. 1 month and then disable it again? Would be weird to have this banner up until the end of time.)

We can remove it with a future release.

@francovenica I've updated the description to cover the additional terms banner changes. Could you test it again?

src/components/common/TermsBanner/index.tsx

…n error

src/pages/_app.tsx

francovenica · 2023-03-06T14:32:09Z

I've changed it so that the Terms banner is only shown if a user previously dismissed the cookie banner. This should cover most existing users.

This works, the new terms and conditions message only shows up if you cleared the cookie banner by accepting some or all the preferences. NOTE: It shows up only if you do a full refresh of the page, just going to another section of the app (like settings or assets) won't be enough.

When opening for the first time, the cookie banner comes up. The link to the cookie policy is https://safe.global/cookie instead of https://app.safe.global/cookie

This one was fixed as well

usame-algan · 2023-03-06T15:27:45Z

This works, the new terms and conditions message only shows up if you cleared the cookie banner by accepting some or all the preferences. NOTE: It shows up only if you do a full refresh of the page, just going to another section of the app (like settings or assets) won't be enough.

I pushed another update to this so that the Terms banner should never show up for new users now, even if they reload the page after accepting cookies.

# Conflicts: # package.json

francovenica · 2023-03-06T15:57:12Z

TLDR; works fine

So testing this makes me a "new user" every time, since clearing the local storage puts the cookie banner in "not cleared" therefore the LS key for the Terms banner will also be set in "not show".
To be an "old user" I have to remove the new key that shows/hide the Terms banner (as old users should not have that key, so still a realistic case). Reloading the page creates and sets the key again in true, showing me the Terms banner.

fix: Add policy pages

62dc779

usame-algan mentioned this pull request Mar 3, 2023

Add policy pages #1723

Closed

usame-algan requested a review from iamacook March 3, 2023 10:19

iamacook reviewed Mar 3, 2023

View reviewed changes

usame-algan added 2 commits March 3, 2023 11:55

Remove popup flicker, fix e2e tests

e623c6f

Terms banner wording

52a157b

usame-algan force-pushed the add-policy-pages branch 2 times, most recently from 16d7127 to 6e96d83 Compare March 3, 2023 11:25

Fix safe apps e2e tests

c1ffe36

usame-algan force-pushed the add-policy-pages branch from 6e96d83 to c1ffe36 Compare March 3, 2023 11:43

usame-algan requested a review from iamacook March 3, 2023 13:04

katspaugh reviewed Mar 3, 2023

View reviewed changes

katspaugh approved these changes Mar 3, 2023

View reviewed changes

chore: Bump version to 1.6.2

ccaa77b

katspaugh reviewed Mar 3, 2023

View reviewed changes

src/components/common/TermsBanner/index.tsx Show resolved Hide resolved

Fix cookie banner link to privacy policy page

bed1c4e

fix: Only show the banner to users who have accepted the cookie banne…

2035443

…r, revert e2e test changes

Merge branch 'main' into add-policy-pages

5948ed7

iamacook reviewed Mar 6, 2023

View reviewed changes

src/components/common/TermsBanner/index.tsx Outdated Show resolved Hide resolved

Remove isMounted and import TermsBanner dynamically to solve hydratio…

5e752b0

…n error

iamacook reviewed Mar 6, 2023

View reviewed changes

src/pages/_app.tsx Show resolved Hide resolved

iamacook approved these changes Mar 6, 2023

View reviewed changes

Add comment, fix e2e tests

428a406

usame-algan force-pushed the add-policy-pages branch from fc59fc5 to 428a406 Compare March 6, 2023 13:09

fix: Invert condition to only show the banner to existing users

b64fe8b

usame-algan added 2 commits March 6, 2023 16:48

chore: Update version to 1.6.3

4473600

Merge remote-tracking branch 'origin/main' into add-policy-pages

717872f

# Conflicts: # package.json

fix: Hide terms banner by default in all cypress tests

6659e63

usame-algan force-pushed the add-policy-pages branch from 4d9aef0 to 6659e63 Compare March 6, 2023 16:36

usame-algan merged commit 6659e63 into main Mar 7, 2023

usame-algan deleted the add-policy-pages branch March 7, 2023 09:15

github-actions bot locked and limited conversation to collaborators Mar 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Add policy pages #1731

fix: Add policy pages #1731

usame-algan commented Mar 3, 2023 •

edited

Loading

github-actions bot commented Mar 3, 2023 •

edited

Loading

github-actions bot commented Mar 3, 2023 •

edited

Loading

iamacook Mar 3, 2023

iamacook Mar 3, 2023

katspaugh Mar 3, 2023

katspaugh commented Mar 3, 2023

francovenica commented Mar 3, 2023

tschubotz commented Mar 3, 2023

tschubotz commented Mar 3, 2023

tschubotz commented Mar 3, 2023

usame-algan commented Mar 6, 2023

tschubotz commented Mar 6, 2023

iamacook commented Mar 6, 2023

usame-algan commented Mar 6, 2023 •

edited

Loading

francovenica commented Mar 6, 2023 •

edited

Loading

usame-algan commented Mar 6, 2023

francovenica commented Mar 6, 2023

	, For general web-browsing of this website, your personal data is not revealed to us, although certain
	, for general web-browsing of this website, your personal data is not revealed to us, although certain

	<p>Last updated on March 2023.</p>
	<p>Last updated on the 6th of March 2023.</p>

fix: Add policy pages #1731

fix: Add policy pages #1731

Conversation

usame-algan commented Mar 3, 2023 • edited Loading

What it solves

How this PR fixes it

How to test it

Screenshots

github-actions bot commented Mar 3, 2023 • edited Loading

Branch preview

github-actions bot commented Mar 3, 2023 • edited Loading

ESLint Summary View Full Report

iamacook Mar 3, 2023

Choose a reason for hiding this comment

iamacook Mar 3, 2023

Choose a reason for hiding this comment

katspaugh Mar 3, 2023

Choose a reason for hiding this comment

katspaugh commented Mar 3, 2023

francovenica commented Mar 3, 2023

tschubotz commented Mar 3, 2023

tschubotz commented Mar 3, 2023

tschubotz commented Mar 3, 2023

usame-algan commented Mar 6, 2023

tschubotz commented Mar 6, 2023

iamacook commented Mar 6, 2023

usame-algan commented Mar 6, 2023 • edited Loading

francovenica commented Mar 6, 2023 • edited Loading

usame-algan commented Mar 6, 2023

francovenica commented Mar 6, 2023

usame-algan commented Mar 3, 2023 •

edited

Loading

github-actions bot commented Mar 3, 2023 •

edited

Loading

github-actions bot commented Mar 3, 2023 •

edited

Loading

usame-algan commented Mar 6, 2023 •

edited

Loading

francovenica commented Mar 6, 2023 •

edited

Loading