Merge pull request #208 from sharetribe/update-v9.0.2-from-upstream

Update v9.0.2 from upstream

CHANGELOG.md

@@ -17,9 +17,19 @@ https://github.com/sharetribe/flex-template-web/
 
 ## Upcoming version 2022-XX-XX
 
+## [v11.0.2] 2022-10-17
+
+### Updates from upstream (FTW-daily v9.0.2)
+
+- [change] Add links to free Privacy Policy and Terms of Service templates
+  [#1553](https://github.com/sharetribe/ftw-daily/pull/1553)
+
+  [v11.0.2]: https://github.com/sharetribe/ftw-hourly/compare/v11.0.1...v11.0.2
+
 ## [v11.0.1] 2022-08-29
 
 ### Updates from upstream (FTW-daily v9.0.1)
+
 - [fix] Use sharetribe-scripts v6.0.1. Fixes for
 
   - GENERATE_SOURCEMAP = false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "private": true,
   "license": "Apache-2.0",
   "dependencies": {
@@ -30,7 +30,7 @@
     "final-form-arrays": "^3.0.2",
     "full-icu": "^1.4.0",
     "helmet": "^4.6.0",
-    "jose": "4.8.1",
+    "jose": "4.9.2",
     "jstimezonedetect": "^1.0.7",
     "lodash": "^4.17.21",
     "mapbox-gl-multitouch": "^1.0.3",

src/components/PrivacyPolicy/PrivacyPolicy.js

@@ -14,10 +14,11 @@ const PrivacyPolicy = props => {
       <p className={css.lastUpdated}>Last updated: November 22, 2019</p>
 
       <p>
-        Thank you for using Yogatime! Ut enim ad minim veniam, quis nostrud exercitation ullamco
-        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
-        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
-        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        Thank you for using Yogatime! Every marketplace business needs Terms of Service and
+        Privacy Policy agreements. To help you launch your marketplace faster, we've compiled 
+        two templates you can use as a baseline for the agreements between your online marketplace 
+        business and its users. You can access these templates at 
+        https://www.sharetribe.com/docs/operator-guides/free-templates/
       </p>
 
       <h2>1 Lorem ipsum dolor sit amet</h2>

src/components/TermsOfService/TermsOfService.js

@@ -14,10 +14,11 @@ const TermsOfService = props => {
       <p className={css.lastUpdated}>Last updated: November 22, 2019</p>
 
       <p>
-        Thank you for using Yogatime! Ut enim ad minim veniam, quis nostrud exercitation ullamco
-        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
-        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
-        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        Thank you for using Yogatime! Every marketplace business needs Terms of Service and
+        Privacy Policy agreements. To help you launch your marketplace faster, we've compiled 
+        two templates you can use as a baseline for the agreements between your online marketplace 
+        business and its users. You can access these templates at 
+        https://www.sharetribe.com/docs/operator-guides/free-templates/
       </p>
 
       <h2>1 Lorem ipsum dolor sit amet</h2>

yarn.lock

@@ -8082,10 +8082,10 @@ jest@^27.4.3:
     import-local "^3.0.2"
     jest-cli "^27.5.1"
 
-jose@4.8.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.8.1.tgz#dc7c2660b115ba29b44880e588c5ac313c158247"
-  integrity sha512-+/hpTbRcCw9YC0TOfN1W47pej4a9lRmltdOVdRLz5FP5UvUq3CenhXjQK7u/8NdMIIShMXYAh9VLPhc7TjhvFw==
+jose@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.2.tgz#268994df4443b9c191de0b001c2e3796ac6cf368"
+  integrity sha512-EqKvu2PqJCD3Jrg3PvcYZVS7D21qMVLSYMDAFcOdGUEOpJSLNtJO7NjLANvu3SYHVl6pdP2ff7ve6EZW2nX7Nw==
 
 js-cookie@^2.1.3:
   version "2.2.1"