diff --git a/package-lock.json b/package-lock.json
index c8afa9c..4b63b96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,9 @@
"version": "0.0.0",
"dependencies": {
"@reduxjs/toolkit": "^1.9.5",
+ "html-react-parser": "^3.0.16",
"i18next": "^22.5.0",
+ "i18next-react-postprocessor": "^3.1.0",
"react": "^18.2.0",
"react-circular-progressbar": "^2.1.0",
"react-dom": "^18.2.0",
@@ -1531,12 +1533,74 @@
"node": ">=6.0.0"
}
},
+ "node_modules/dom-serializer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+ "dependencies": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.2",
+ "entities": "^4.2.0"
+ },
+ "funding": {
+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+ }
+ },
+ "node_modules/domelementtype": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/fb55"
+ }
+ ]
+ },
+ "node_modules/domhandler": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+ "dependencies": {
+ "domelementtype": "^2.3.0"
+ },
+ "engines": {
+ "node": ">= 4"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domhandler?sponsor=1"
+ }
+ },
+ "node_modules/domutils": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+ "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+ "dependencies": {
+ "dom-serializer": "^2.0.0",
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domutils?sponsor=1"
+ }
+ },
"node_modules/electron-to-chromium": {
"version": "1.4.376",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.376.tgz",
"integrity": "sha512-TFeOKd98TpJzRHkr4Aorn16QkMnuCQuGAE6IZ0wYF+qkbSfMPqjplvRppR02tMUpVxZz8nyBNvVm9lIZsqrbPQ==",
"dev": true
},
+ "node_modules/entities": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+ "engines": {
+ "node": ">=0.12"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1"
+ }
+ },
"node_modules/esbuild": {
"version": "0.17.18",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.18.tgz",
@@ -2131,6 +2195,15 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
+ "node_modules/html-dom-parser": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-3.1.7.tgz",
+ "integrity": "sha512-cDgNF4YgF6J3H+d9mcldGL19p0GzVdS3iGuDNzYWQpU47q3+IRM85X3Xo07E+nntF4ek4s78A9V24EwxlPTjig==",
+ "dependencies": {
+ "domhandler": "5.0.3",
+ "htmlparser2": "8.0.2"
+ }
+ },
"node_modules/html-parse-stringify": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
@@ -2139,6 +2212,38 @@
"void-elements": "3.1.0"
}
},
+ "node_modules/html-react-parser": {
+ "version": "3.0.16",
+ "resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-3.0.16.tgz",
+ "integrity": "sha512-ysQZtRFPcg+McVb4B05oNWSnqM14zagpvTgGcI5e1/BvCl38YwzWzKibrbBmXeemg70olN1bAoeixo7o06G5Eg==",
+ "dependencies": {
+ "domhandler": "5.0.3",
+ "html-dom-parser": "3.1.7",
+ "react-property": "2.0.0",
+ "style-to-js": "1.1.3"
+ },
+ "peerDependencies": {
+ "react": "0.14 || 15 || 16 || 17 || 18"
+ }
+ },
+ "node_modules/htmlparser2": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+ "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+ "funding": [
+ "https://github.com/fb55/htmlparser2?sponsor=1",
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/fb55"
+ }
+ ],
+ "dependencies": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3",
+ "domutils": "^3.0.1",
+ "entities": "^4.4.0"
+ }
+ },
"node_modules/i18next": {
"version": "22.5.0",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.0.tgz",
@@ -2161,6 +2266,18 @@
"@babel/runtime": "^7.20.6"
}
},
+ "node_modules/i18next-react-postprocessor": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/i18next-react-postprocessor/-/i18next-react-postprocessor-3.1.0.tgz",
+ "integrity": "sha512-VG1k4KSEwuYQlGRtksPfcp6PXjOUCD5jRtrAW+nfAzds8ksKzTvScHt9ue7G8RPuqKS1Ctx3je1hDDd83usWVw==",
+ "dependencies": {
+ "md5-es": "^1.8.2"
+ },
+ "peerDependencies": {
+ "i18next": ">=8.4.3",
+ "react": ">=15.6.1"
+ }
+ },
"node_modules/ignore": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -2220,6 +2337,11 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "node_modules/inline-style-parser": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
+ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
+ },
"node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -2372,6 +2494,11 @@
"yallist": "^3.0.2"
}
},
+ "node_modules/md5-es": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/md5-es/-/md5-es-1.8.2.tgz",
+ "integrity": "sha512-LKq5jmKMhJYhsBFUh2w+J3C4bMiC5uQie/UYJ429UATmMnFr6iANO2uQq5HXAZSIupGp0WO2mH3sNfxR4XO40Q=="
+ },
"node_modules/merge2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -2693,6 +2820,11 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
},
+ "node_modules/react-property": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz",
+ "integrity": "sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw=="
+ },
"node_modules/react-redux": {
"version": "8.0.5",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz",
@@ -2973,6 +3105,22 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/style-to-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz",
+ "integrity": "sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ==",
+ "dependencies": {
+ "style-to-object": "0.4.1"
+ }
+ },
+ "node_modules/style-to-object": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz",
+ "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==",
+ "dependencies": {
+ "inline-style-parser": "0.1.1"
+ }
+ },
"node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4194,12 +4342,50 @@
"esutils": "^2.0.2"
}
},
+ "dom-serializer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+ "requires": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.2",
+ "entities": "^4.2.0"
+ }
+ },
+ "domelementtype": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
+ },
+ "domhandler": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+ "requires": {
+ "domelementtype": "^2.3.0"
+ }
+ },
+ "domutils": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+ "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+ "requires": {
+ "dom-serializer": "^2.0.0",
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3"
+ }
+ },
"electron-to-chromium": {
"version": "1.4.376",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.376.tgz",
"integrity": "sha512-TFeOKd98TpJzRHkr4Aorn16QkMnuCQuGAE6IZ0wYF+qkbSfMPqjplvRppR02tMUpVxZz8nyBNvVm9lIZsqrbPQ==",
"dev": true
},
+ "entities": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+ },
"esbuild": {
"version": "0.17.18",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.18.tgz",
@@ -4648,6 +4834,15 @@
}
}
},
+ "html-dom-parser": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-3.1.7.tgz",
+ "integrity": "sha512-cDgNF4YgF6J3H+d9mcldGL19p0GzVdS3iGuDNzYWQpU47q3+IRM85X3Xo07E+nntF4ek4s78A9V24EwxlPTjig==",
+ "requires": {
+ "domhandler": "5.0.3",
+ "htmlparser2": "8.0.2"
+ }
+ },
"html-parse-stringify": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
@@ -4656,6 +4851,28 @@
"void-elements": "3.1.0"
}
},
+ "html-react-parser": {
+ "version": "3.0.16",
+ "resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-3.0.16.tgz",
+ "integrity": "sha512-ysQZtRFPcg+McVb4B05oNWSnqM14zagpvTgGcI5e1/BvCl38YwzWzKibrbBmXeemg70olN1bAoeixo7o06G5Eg==",
+ "requires": {
+ "domhandler": "5.0.3",
+ "html-dom-parser": "3.1.7",
+ "react-property": "2.0.0",
+ "style-to-js": "1.1.3"
+ }
+ },
+ "htmlparser2": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+ "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+ "requires": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3",
+ "domutils": "^3.0.1",
+ "entities": "^4.4.0"
+ }
+ },
"i18next": {
"version": "22.5.0",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.0.tgz",
@@ -4664,6 +4881,14 @@
"@babel/runtime": "^7.20.6"
}
},
+ "i18next-react-postprocessor": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/i18next-react-postprocessor/-/i18next-react-postprocessor-3.1.0.tgz",
+ "integrity": "sha512-VG1k4KSEwuYQlGRtksPfcp6PXjOUCD5jRtrAW+nfAzds8ksKzTvScHt9ue7G8RPuqKS1Ctx3je1hDDd83usWVw==",
+ "requires": {
+ "md5-es": "^1.8.2"
+ }
+ },
"ignore": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -4707,6 +4932,11 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "inline-style-parser": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
+ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
+ },
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4820,6 +5050,11 @@
"yallist": "^3.0.2"
}
},
+ "md5-es": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/md5-es/-/md5-es-1.8.2.tgz",
+ "integrity": "sha512-LKq5jmKMhJYhsBFUh2w+J3C4bMiC5uQie/UYJ429UATmMnFr6iANO2uQq5HXAZSIupGp0WO2mH3sNfxR4XO40Q=="
+ },
"merge2": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -5027,6 +5262,11 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
},
+ "react-property": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz",
+ "integrity": "sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw=="
+ },
"react-redux": {
"version": "8.0.5",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz",
@@ -5202,6 +5442,22 @@
"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
"dev": true
},
+ "style-to-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz",
+ "integrity": "sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ==",
+ "requires": {
+ "style-to-object": "0.4.1"
+ }
+ },
+ "style-to-object": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz",
+ "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==",
+ "requires": {
+ "inline-style-parser": "0.1.1"
+ }
+ },
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
diff --git a/package.json b/package.json
index 90ff736..8168c9d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,9 @@
},
"dependencies": {
"@reduxjs/toolkit": "^1.9.5",
+ "html-react-parser": "^3.0.16",
"i18next": "^22.5.0",
+ "i18next-react-postprocessor": "^3.1.0",
"react": "^18.2.0",
"react-circular-progressbar": "^2.1.0",
"react-dom": "^18.2.0",
diff --git a/src/components/BirthdayPage/index.tsx b/src/components/BirthdayPage/index.tsx
index 863b5d2..429e2a8 100644
--- a/src/components/BirthdayPage/index.tsx
+++ b/src/components/BirthdayPage/index.tsx
@@ -17,11 +17,6 @@ function BirthdayPage(): JSX.Element {
const navigate = useNavigate()
const birthdate = useSelector(selectors.selectBirthdate)
const [isDisabled, setIsDisabled] = useState(true)
- const links = [
- { text: 'EULA', href: 'https://aura.wit.life/terms' },
- { text: 'Privacy Notice', href: 'https://aura.wit.life/privacy' },
- { text: 'here', href: 'https://aura.wit.life/' },
- ]
const handleNext = () => navigate(routes.client.birthtime())
const handleValid = (birthdate: string) => {
dispatch(actions.form.addDate(birthdate))
@@ -42,7 +37,13 @@ function BirthdayPage(): JSX.Element {
{t('next')}
diff --git a/src/components/EmailEnterPage/index.tsx b/src/components/EmailEnterPage/index.tsx
index f61ff96..c62a156 100644
--- a/src/components/EmailEnterPage/index.tsx
+++ b/src/components/EmailEnterPage/index.tsx
@@ -27,10 +27,6 @@ function EmailEnterPage(): JSX.Element {
const [error, setError] = useState(null)
const timezone = getClientTimezone()
const locale = i18n.language
- const links = [
- { text: 'EULA', href: 'https://aura.wit.life/terms' },
- { text: 'Privacy Policy', href: 'https://aura.wit.life/privacy' },
- ]
const handleValidEmail = (email: string) => {
dispatch(actions.form.addEmail(email))
setIsDisabled(false)
@@ -66,7 +62,12 @@ function EmailEnterPage(): JSX.Element {
onInvalid={() => setIsDisabled(true)}
/>
{t('we_dont_share')}
- {t('continue_agree')}
+
+ {t('continue_agree', {
+ eulaLink: {t('eula')},
+ privacyLink: {t('privacy_policy')},
+ })}
+
{isLoading ? : t('continue')}
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index be3e040..525ab05 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from 'react-i18next'
import { Link } from 'react-router-dom'
import { useAuth } from '../../auth'
import { useLegal } from '../../legal'
@@ -13,6 +14,7 @@ const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1)
function Navbar({ isOpen, closeMenu }: NavbarProps): JSX.Element {
const { logout } = useAuth()
+ const { t } = useTranslation()
const legal = useLegal()
const combinedClassNames = ['navbar', isOpen && 'navbar--open'].filter(Boolean).join(' ')
return (
@@ -31,7 +33,10 @@ function Navbar({ isOpen, closeMenu }: NavbarProps): JSX.Element {
{capitalize(item.title)}
))}
- Contact us
+
+ {t('contact_us')}
+
+
Log Out
diff --git a/src/components/PaymentPage/index.tsx b/src/components/PaymentPage/index.tsx
index a57787e..61ad87f 100644
--- a/src/components/PaymentPage/index.tsx
+++ b/src/components/PaymentPage/index.tsx
@@ -57,7 +57,9 @@ function PaymentPage(): JSX.Element {
{t('card')}
- You will be charged only $1 for your 7-day trial. We'll email your a reminder before your trial period ends.
+
+ {t('will_be_charged', { strongText: {t('trial_price')} })}
+
)}
diff --git a/src/components/Policy/index.tsx b/src/components/Policy/index.tsx
index 9979f7b..06a2930 100644
--- a/src/components/Policy/index.tsx
+++ b/src/components/Policy/index.tsx
@@ -1,13 +1,6 @@
-import { ReactNode } from 'react'
import './styles.css'
-type Link = {
- text: string
- href: string
-}
-
interface PolicyProps {
- links: Link[]
children: string
sizing?: 'small' | 'medium' | 'large'
}
@@ -18,26 +11,10 @@ const sizes = {
large: 'policy--large',
}
-function Policy({ links, children, sizing = 'small' }: PolicyProps): JSX.Element {
- const createLinkedContent = (sentence: string): ReactNode[] => {
- const pattern = links.map(link => `(${link.text})`).join('|');
- const regex = new RegExp(pattern, 'g');
- return sentence.split(regex).map((part, idx) => {
- const link = links.find(({ text }) => text === part);
-
- if (!link) return part
-
- return (
-
- {link.text}
-
- );
- });
- }
-
+function Policy({ children, sizing = 'small' }: PolicyProps): JSX.Element {
return (
-
{createLinkedContent(children)}
+
{children}
{parse(data?.body)}
}
{error && }
)
diff --git a/src/components/SubscriptionPage/index.tsx b/src/components/SubscriptionPage/index.tsx
index 3c9d706..d74d1c0 100644
--- a/src/components/SubscriptionPage/index.tsx
+++ b/src/components/SubscriptionPage/index.tsx
@@ -14,9 +14,6 @@ function SubscriptionPage(): JSX.Element {
const { t } = useTranslation()
const navigate = useNavigate()
const email = useSelector(selectors.selectEmail)
- const links = [
- { text: 'Subscription policy', href: 'https://aura.wit.life/' },
- ]
const currency = Currency.USD
const locale = Locale.EN
const paymentItems = [
@@ -35,7 +32,11 @@ function SubscriptionPage(): JSX.Element {
{t('get_access')}
- {t('subscription_policy')}
+
+ {t('subscription_text', {
+ policyLink: {t('subscription_policy')},
+ })}
+
)
diff --git a/src/init.tsx b/src/init.tsx
index 94830e4..954ae0e 100644
--- a/src/init.tsx
+++ b/src/init.tsx
@@ -1,5 +1,6 @@
import React from 'react'
import i18next from 'i18next'
+import ReactPostprocessor from 'i18next-react-postprocessor'
import { BrowserRouter } from 'react-router-dom'
import { I18nextProvider, initReactI18next } from 'react-i18next'
import { Provider } from 'react-redux'
@@ -17,8 +18,8 @@ const init = async () => {
const resources = buildResources(response)
const legal = buildLegal(response)
const i18nextInstance = i18next.createInstance()
- const options = { lng, resources, fallbackLng }
- await i18nextInstance.use(initReactI18next).init(options)
+ const options = { lng, resources, fallbackLng, postProcess: [ `reactPostprocessor` ] }
+ await i18nextInstance.use(initReactI18next).use(new ReactPostprocessor()).init(options)
return (
diff --git a/src/locales/dev.ts b/src/locales/dev.ts
index 970c01a..7c2e62e 100644
--- a/src/locales/dev.ts
+++ b/src/locales/dev.ts
@@ -3,7 +3,10 @@ export default {
lets_start: "Let's start!",
next: "Next",
date_of_birth: "What's your date of birth?",
- privacy_text: "By continuing, you agree to our EULA and Privacy Notice. Have a question? Reach our support team here",
+ privacy_text: "By continuing, you agree to our and . Have a question? Reach our support team ",
+ eula: 'EULA',
+ here: 'here',
+ privacy_notice: 'Privacy Notice',
born_time_question: "What time were you born?",
nasa_data_using: "We use NASA data to determine the exact position of the planets in the sky at the time of your birth to create wallpapers that are just right for you.",
cta_title: "Start your 7-day trial",
@@ -20,19 +23,24 @@ export default {
we_will_email_you: "We will email you a copy of your wallpaper for easy access.",
your_email: "Your email",
we_dont_share: "We don't share any personal information.",
- continue_agree: 'By clicking "Continue" below, you agree to our EULA and Privacy Policy.',
+ continue_agree: 'By clicking "Continue" below, you agree to our and .',
+ privacy_policy: "Privacy Policy",
continue: 'Continue',
app_name: "Aura",
unexpected_error: 'Sorry, an unexpected error has occurred.',
oops: "Oops!",
- total_today: 'Total today',
+ total_today: "Total today",
charged_only: "You will be charged only $1 for your 7-day trial. We'll email you a reminder before your trial period ends. Cancel anytime.",
- purposes: 'For entertaiment purposes only.',
- get_access: 'Get access',
- subscription_policy: 'By proceeding, you agree that if you do not cancel your subscription before the end of the 7-day trial period, you will be automatically charged nineteen US dollars zero cents every 2 weeks until you cancel the subscription in the settings. Learn more about cancellation and refund policy in Subscription policy',
- company_name: 'Wit LLC, California, US',
- choose_payment: 'Choose Payment Method',
- or: 'OR',
- card: 'Credit / Debit Card',
+ purposes: "For entertaiment purposes only.",
+ get_access: "Get access",
+ subscription_text: "By proceeding, you agree that if you do not cancel your subscription before the end of the 7-day trial period, you will be automatically charged nineteen US dollars zero cents every 2 weeks until you cancel the subscription in the settings. Learn more about cancellation and refund policy in ",
+ subscription_policy: "Subscription policy",
+ company_name: "Wit LLC, California, US",
+ choose_payment: "Choose Payment Method",
+ or: "OR",
+ card: "Credit / Debit Card",
+ contact_us: "Contact us",
+ will_be_charged: "You will be charged only . We'll email your a reminder before your trial period ends.",
+ trial_price: "$1 for your 7-day trial",
},
}