Merge pull request #80 from lidofinance/fix/call-terms-modal-less-fre…

…quently Fix: open Terms modal only if terms were not accepted earlier
lidofinance · Jul 25, 2023 · 9b6bad4 · 9b6bad4
2 parents e00db59 + ff82576
commit 9b6bad4
Show file tree

Hide file tree

Showing 16 changed files with 248 additions and 47 deletions.
diff --git a/packages/connect-wallet-modal/CHANGELOG.md b/packages/connect-wallet-modal/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/connect-wallet-modal
 
+## 1.6.1
+
+### Patch Changes
+
+- Move TERMS_ACCEPTANCE_LS_K const into core-react package
+
 ## 1.6.0
 
 ### Minor Changes

diff --git a/packages/connect-wallet-modal/package.json b/packages/connect-wallet-modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/connect-wallet-modal",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -41,12 +41,12 @@
     "@types/react-dom": "17"
   },
   "devDependencies": {
-    "@reef-knot/core-react": "^1.5.0",
+    "@reef-knot/core-react": "^1.5.1",
     "@reef-knot/types": "^1.3.0",
     "@reef-knot/ui-react": "^1.0.7",
     "@reef-knot/wallets-icons": "^1.0.0",
     "@reef-knot/wallets-helpers": "^1.1.5",
-    "@reef-knot/web3-react": "^1.4.0",
+    "@reef-knot/web3-react": "^1.4.1",
     "@types/ua-parser-js": "^0.7.36",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/packages/connect-wallet-modal/src/components/WalletsModal/WalletsModal.tsx b/packages/connect-wallet-modal/src/components/WalletsModal/WalletsModal.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { Button, Modal } from '@reef-knot/ui-react';
-import { AcceptTermsModalContext } from '@reef-knot/core-react';
+import { AcceptTermsModalContext, LS_KEY_TERMS_ACCEPTANCE } from '@reef-knot/core-react';
 import {
   WalletsModalProps,
   ButtonsCommonProps,
@@ -20,12 +20,8 @@ export function WalletsModal(props: WalletsModalProps): JSX.Element {
     privacyNoticeLink,
   } = props;
 
-  // This key can be changed to enforce all users to accept the Terms again,
-  // for example if the Terms were significantly updated
-  const TERMS_ACCEPTANCE_LS_KEY = 'reef-knot_accept-terms_n2';
-
   const [termsChecked, setTermsChecked] = useLocalStorage(
-    TERMS_ACCEPTANCE_LS_KEY,
+    LS_KEY_TERMS_ACCEPTANCE,
     false,
   );
 

diff --git a/packages/core-react/CHANGELOG.md b/packages/core-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/core-react
 
+## 1.5.1
+
+### Patch Changes
+
+- Move TERMS_ACCEPTANCE_LS_K const into core-react package
+
 ## 1.5.0
 
 ### Minor Changes

diff --git a/packages/core-react/package.json b/packages/core-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/core-react",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

diff --git a/packages/core-react/src/constants/index.ts b/packages/core-react/src/constants/index.ts
@@ -0,0 +1 @@
+export * from './localStorage';
diff --git a/packages/core-react/src/constants/localStorage.ts b/packages/core-react/src/constants/localStorage.ts
@@ -0,0 +1,3 @@
+// This key can be changed to enforce all users to accept the Terms again,
+// for example if the Terms were significantly updated
+export const LS_KEY_TERMS_ACCEPTANCE = 'reef-knot_accept-terms_n2';
diff --git a/packages/core-react/src/context/index.ts b/packages/core-react/src/context/index.ts
@@ -0,0 +1,2 @@
+export * from './reefKnot'
+export * from './acceptTermsModal'
diff --git a/packages/core-react/src/index.ts b/packages/core-react/src/index.ts
@@ -1,14 +1,4 @@
 export * from './walletData';
 export * from './hooks';
-
-export type { AcceptTermsModalContextValue } from './context/acceptTermsModal.js';
-export {
-  AcceptTermsModalContext,
-  AcceptTermsModalContextProvider,
-} from './context/acceptTermsModal.js';
-
-export type {
-  ReefKnotContextValue,
-  ReefKnotContextProps,
-} from './context/reefKnot';
-export { ReefKnotContext, ReefKnot } from './context/reefKnot';
+export * from './context';
+export * from './constants';
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
@@ -17,5 +17,13 @@ module.exports = {
     "sourceType": "module",
     "project": ["tsconfig.json"]
   },
-  "ignorePatterns": ["*.js", "dist", "node_modules"]
+  "ignorePatterns": ["*.js", "dist", "node_modules"],
+  "settings": {
+    "react": {
+      "version": "detect"
+    },
+    "import/resolver": {
+      "typescript": {}
+    }
+  }
 }
diff --git a/packages/reef-knot/CHANGELOG.md b/packages/reef-knot/CHANGELOG.md
@@ -1,5 +1,15 @@
 # reef-knot
 
+## 1.7.1
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+  - @reef-knot/web3-react@1.4.1
+  - @reef-knot/connect-wallet-modal@1.6.1
+  - @reef-knot/core-react@1.5.1
+
 ## 1.6.2
 
 ### Patch Changes

diff --git a/packages/reef-knot/package.json b/packages/reef-knot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reef-knot",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -41,9 +41,9 @@
     "lint": "eslint"
   },
   "dependencies": {
-    "@reef-knot/connect-wallet-modal": "1.6.0",
-    "@reef-knot/core-react": "1.5.0",
-    "@reef-knot/web3-react": "1.4.0",
+    "@reef-knot/connect-wallet-modal": "1.6.1",
+    "@reef-knot/core-react": "1.5.1",
+    "@reef-knot/web3-react": "1.4.1",
     "@reef-knot/ui-react": "1.0.7",
     "@reef-knot/wallets-icons": "1.0.0",
     "@reef-knot/wallets-list": "1.4.4",

diff --git a/packages/web3-react/CHANGELOG.md b/packages/web3-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/web3-react
 
+## 1.4.1
+
+### Patch Changes
+
+- Open Terms modal only if terms were not accepted earlier
+
 ## 1.4.0
 
 ### Minor Changes

diff --git a/packages/web3-react/package.json b/packages/web3-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/web3-react",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -46,7 +46,7 @@
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
     "@ethersproject/providers": "^5.7.2",
-    "@reef-knot/core-react": "^1.5.0",
+    "@reef-knot/core-react": "^1.5.1",
     "@reef-knot/ledger-connector": "^1.0.0",
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^7.0.2",

diff --git a/packages/web3-react/src/hooks/useAutoConnect.ts b/packages/web3-react/src/hooks/useAutoConnect.ts
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useContext } from 'react';
-import { AcceptTermsModalContext } from '@reef-knot/core-react';
+import { AcceptTermsModalContext, LS_KEY_TERMS_ACCEPTANCE } from '@reef-knot/core-react';
 import { useWeb3 } from './useWeb3';
 import { useConnectorStorage } from './useConnectorStorage';
 import { useConnectorInfo } from './useConnectorInfo';
@@ -48,16 +48,20 @@ export const useEagerConnector = (connectors: ConnectorsContextValue) => {
       })();
       if (!connector) return;
 
-      if (shouldAutoConnectApp) {
-        const onContinue = () => {
-          activate(connector, undefined, true);
-        };
-        acceptTermsModal.setOnContinue?.(() => onContinue);
+      const connectWallet = () => activate(connector, undefined, true);
+
+      let termsAccepted = false;
+      if (typeof window !== 'undefined') {
+        termsAccepted = window.localStorage?.getItem(LS_KEY_TERMS_ACCEPTANCE) === 'true';
+      }
+
+      if (shouldAutoConnectApp && !termsAccepted) {
+        acceptTermsModal.setOnContinue?.(() => connectWallet);
         acceptTermsModal.setVisible?.(true);
         return;
       }
 
-      await activate(connector, undefined, true);
+      await connectWallet();
     })();
   }, [
     activate,