From 06cc09267b343a5969367fd592758498482d4e8f Mon Sep 17 00:00:00 2001
From: Mikhail Mikheev <mdoublemmm@gmail.com>
Date: Tue, 5 Jun 2018 18:35:38 +0400
Subject: [PATCH 1/2] Add ToS, PP and RDP PM-641

---
 .../olympia/development/interface.config.json             | 6 +++---
 .../environments/olympia/production/interface.config.json | 8 +++++++-
 config/environments/olympia/staging/interface.config.json | 8 +++++++-
 src/components/ModalContent/RegisterWallet/index.js       | 8 ++++----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/config/environments/olympia/development/interface.config.json b/config/environments/olympia/development/interface.config.json
index e012a8d55..fe9a023f0 100644
--- 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
index 3f04d146b..c37b9207a 100644
--- 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
index 53a4418b6..464ef746e 100644
--- 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
index 7f60f81c4..6d6f20a8f 100644
--- a/src/components/ModalContent/RegisterWallet/index.js
+++ b/src/components/ModalContent/RegisterWallet/index.js
@@ -77,18 +77,18 @@ 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">
+              <a href={riskDisclaimerUrl} target="_blank" rel="noopener noreferrer">
                 disclaimer policy
               </a>
             </Field>

From 5ee059576c0f0d3797846224c69c7b970ad27b7e Mon Sep 17 00:00:00 2001
From: Mikhail Mikheev <mdoublemmm@gmail.com>
Date: Tue, 5 Jun 2018 18:38:09 +0400
Subject: [PATCH 2/2] Small markup fix PM-641

---
 src/components/ModalContent/RegisterWallet/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ModalContent/RegisterWallet/index.js b/src/components/ModalContent/RegisterWallet/index.js
index 6d6f20a8f..d66c16566 100644
--- a/src/components/ModalContent/RegisterWallet/index.js
+++ b/src/components/ModalContent/RegisterWallet/index.js
@@ -87,9 +87,9 @@ const RegisterMainnetAddress = ({
           )}
           {!!riskDisclaimerUrl && (
             <Field name="agreedWithRDP" component={Checkbox} className={cx('checkBox')}>
-              I have read the risk{' '}
+              I have read the{' '}
               <a href={riskDisclaimerUrl} target="_blank" rel="noopener noreferrer">
-                disclaimer policy
+                risk disclaimer policy
               </a>
             </Field>
           )}