BUG PM-641: The user creates a new account and the interface does not…

… ask to accept terms and conditions (#395) * Add ToS, PP and RDP PM-641 * Small markup fix PM-641
gnosis · Jun 6, 2018 · 3349915 · 3349915
1 parent 59baddb
commit 3349915
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/config/environments/olympia/development/interface.config.json b/config/environments/olympia/development/interface.config.json
@@ -40,13 +40,13 @@
     "type": "default"
   },
   "termsOfUse": {
-    "url": "/TermsOfService.html"
+    "url": "/assets/content/TermsOfService.html"
   },
   "riskDisclaimer": {
-    "url": "/RiskDisclaimerPolicy.html"
+    "url": "/assets/content/RiskDisclaimerPolicy.html"
   },
   "privacyPolicy": {
-    "url": "/PrivacyPolicy.html"
+    "url": "/assets/content/PrivacyPolicy.html"
   },
   "footer": {
     "enabled": true,

diff --git a/config/environments/olympia/production/interface.config.json b/config/environments/olympia/production/interface.config.json
@@ -40,7 +40,13 @@
     "type": "default"
   },
   "termsOfUse": {
-    "url": null
+    "url": "/assets/content/TermsOfService.html"
+  },
+  "riskDisclaimer": {
+    "url": "/assets/content/RiskDisclaimerPolicy.html"
+  },
+  "privacyPolicy": {
+    "url": "/assets/content/PrivacyPolicy.html"
   },
   "footer": {
     "enabled": true,

diff --git a/config/environments/olympia/staging/interface.config.json b/config/environments/olympia/staging/interface.config.json
@@ -40,7 +40,13 @@
     "type": "default"
   },
   "termsOfUse": {
-    "url": null
+    "url": "/assets/content/TermsOfService.html"
+  },
+  "riskDisclaimer": {
+    "url": "/assets/content/RiskDisclaimerPolicy.html"
+  },
+  "privacyPolicy": {
+    "url": "/assets/content/PrivacyPolicy.html"
   },
   "footer": {
     "enabled": true,

diff --git a/src/components/ModalContent/RegisterWallet/index.js b/src/components/ModalContent/RegisterWallet/index.js
@@ -77,19 +77,19 @@ const RegisterMainnetAddress = ({
               </a>
             </Field>
           )}
-          {!!riskDisclaimerUrl && (
+          {!!privacyPolicyUrl && (
             <Field name="agreedWithPP" component={Checkbox} className={cx('checkBox')}>
               I agree with{' '}
-              <a href={riskDisclaimerUrl} target="_blank" rel="noopener noreferrer">
+              <a href={privacyPolicyUrl} target="_blank" rel="noopener noreferrer">
                 privacy policy
               </a>
             </Field>
           )}
-          {privacyPolicyUrl && (
+          {!!riskDisclaimerUrl && (
             <Field name="agreedWithRDP" component={Checkbox} className={cx('checkBox')}>
-              I have read the risk{' '}
-              <a href={privacyPolicyUrl} target="_blank" rel="noopener noreferrer">
-                disclaimer policy
+              I have read the{' '}
+              <a href={riskDisclaimerUrl} target="_blank" rel="noopener noreferrer">
+                risk disclaimer policy
               </a>
             </Field>
           )}