From 94d17c0b9b307025ce5d1e5f8cf9f17cde17b792 Mon Sep 17 00:00:00 2001
From: Ivan Kordonets <ivan.kordonets@virtuozzo.com>
Date: Mon, 23 Oct 2023 23:42:30 +0300
Subject: [PATCH 1/2] stash

---
 .../common/components/TermsOfServiceBody.jsx  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/js/common/components/TermsOfServiceBody.jsx b/src/js/common/components/TermsOfServiceBody.jsx
index 0cfa70a3b..fc5b3dc07 100755
--- a/src/js/common/components/TermsOfServiceBody.jsx
+++ b/src/js/common/components/TermsOfServiceBody.jsx
@@ -1,8 +1,11 @@
-import React, { Component } from 'react';
+import React, { Component, Suspense } from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { renderLog } from '../utils/logging';
 
+const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ './Widgets/OpenExternalWebSite'));
+
+
 export default class TermsOfServiceBody extends Component {
   static getProps () {
     return {};
@@ -13,7 +16,7 @@ export default class TermsOfServiceBody extends Component {
     return (
       <div>
         <ContentTitle>Terms of Service</ContentTitle>
-        <p><strong>Last updated: August 12th, 2022</strong></p>
+        <p><strong>Last updated: October 23rd, 2023</strong></p>
 
         <h2>Overview</h2>
         <p>This website (also packaged in mobile apps) is operated by We Vote USA. Throughout the site, the terms “We Vote”, “we”, “us” and “our” refer to We Vote USA. We Vote USA offers this website, including all information, tools and services available from this site to you, the user, conditioned upon your acceptance of all terms, conditions, policies and notices stated here.</p>
@@ -27,7 +30,24 @@ export default class TermsOfServiceBody extends Component {
         <p>A breach or violation of any of the Terms will result in an immediate termination of your Services.</p>
         <h2>General Conditions</h2>
         <p>You agree not to reproduce, duplicate, copy, sell, resell or exploit any portion of the Service, use of the Service, or access to the Service or any contact on the website through which the service is provided, without express written permission by us.</p>
+<<<<<<< Updated upstream
         <p>We Vote grants permission to copy the software that powers this website, made available at https://github.com/WeVote, under the MIT License.</p>
+=======
+        <p>
+          We Vote grants permission to copy the software that powers this website, made available at
+          {' '}
+          <Suspense fallback={<></>}>
+            <OpenExternalWebSite
+                linkIdAttribute="wevoteGitHub"
+                url="https://github.com/WeVote"
+                target="_blank"
+                body={<span>https://github.com/WeVote</span>}
+            />
+          </Suspense>
+          , under the MIT License.
+          {' '}
+        </p>
+>>>>>>> Stashed changes
         <p>The headings used in this agreement are included for convenience only and will not limit or otherwise affect these Terms.</p>
         <h2>Accuracy, Completeness and Timeliness of Information</h2>
         <p>We are not responsible if information made available on this site is not accurate, complete or current. The material on this site is provided for general information only and should not be relied upon or used as the sole basis for making decisions without consulting primary, more accurate, more complete or more timely sources of information. Any reliance on the material on this site is at your own risk.</p>

From cdb4f5070a4f42ec944a99468091c910abdc1b66 Mon Sep 17 00:00:00 2001
From: Dale John McGrew <Dale.McGrew@WeVote.US>
Date: Mon, 23 Oct 2023 14:00:11 -0700
Subject: [PATCH 2/2] Update TermsOfServiceBody.jsx

Removed compare warnings.
---
 src/js/common/components/TermsOfServiceBody.jsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/js/common/components/TermsOfServiceBody.jsx b/src/js/common/components/TermsOfServiceBody.jsx
index fc5b3dc07..f8d9dade5 100755
--- a/src/js/common/components/TermsOfServiceBody.jsx
+++ b/src/js/common/components/TermsOfServiceBody.jsx
@@ -30,9 +30,6 @@ export default class TermsOfServiceBody extends Component {
         <p>A breach or violation of any of the Terms will result in an immediate termination of your Services.</p>
         <h2>General Conditions</h2>
         <p>You agree not to reproduce, duplicate, copy, sell, resell or exploit any portion of the Service, use of the Service, or access to the Service or any contact on the website through which the service is provided, without express written permission by us.</p>
-<<<<<<< Updated upstream
-        <p>We Vote grants permission to copy the software that powers this website, made available at https://github.com/WeVote, under the MIT License.</p>
-=======
         <p>
           We Vote grants permission to copy the software that powers this website, made available at
           {' '}
@@ -47,7 +44,6 @@ export default class TermsOfServiceBody extends Component {
           , under the MIT License.
           {' '}
         </p>
->>>>>>> Stashed changes
         <p>The headings used in this agreement are included for convenience only and will not limit or otherwise affect these Terms.</p>
         <h2>Accuracy, Completeness and Timeliness of Information</h2>
         <p>We are not responsible if information made available on this site is not accurate, complete or current. The material on this site is provided for general information only and should not be relied upon or used as the sole basis for making decisions without consulting primary, more accurate, more complete or more timely sources of information. Any reliance on the material on this site is at your own risk.</p>