[TMA - 389] (#117)

* Done

* Done

* Done

2 files changed, 62 insertions, 25 deletions

diff --git a/src/components/onboarding/TermsAndConditionsText.tsx b/src/components/onboarding/TermsAndConditionsText.tsx
index cc557832..39450667 100644
--- a/src/components/onboarding/TermsAndConditionsText.tsx
+++ b/src/components/onboarding/TermsAndConditionsText.tsx
@@ -9,7 +9,7 @@ const TermsAndConditionsText: React.FC = () => {
   return (
     <React.Fragment>
       <Text style={styles.bold}>
-        Last updated: <Text style={styles.unbold}>October 13, 2020</Text>
+        Last updated: <Text style={styles.unbold}>November 6, 2020</Text>
       </Text>
       <Text style={styles.para}>
         Please read these terms and conditions carefully before using Our
@@ -27,7 +27,7 @@ const TermsAndConditionsText: React.FC = () => {
       </Text>
       <Text style={styles.subHeading}>Definitions</Text>
       <Text style={styles.para}>
-        For the purposes of these Terms and Conditions:
+        For the purposes of these Terms of Service:
       </Text>
       <Text style={styles.para}>
         <Text style={styles.bold}>Application</Text> means the software program
@@ -58,15 +58,15 @@ const TermsAndConditionsText: React.FC = () => {
       </Text>
       <Text style={styles.para}>
         <Text style={styles.bold}>Content</Text> refers to content such as text,
-        images, or other information that can be posted, uploaded, linked to or
+        images, or other information that can be posted, uploaded, linked to, or
         otherwise made available by You, regardless of the form of that content.
       </Text>
       <Text style={styles.paraLeftAlign}>
         <Text style={styles.bold}>Country</Text> refers to: Texas, United States
       </Text>
-      <Text style={styles.para}>
-        <Text style={styles.bold}>Device</Text> means any device that can access
-        the Service such as a computer, a cellphone or a digital tablet.
+      <Text style={styles.paraLeftAlign}>
+        <Text style={styles.bold}>Device </Text> means any device that can
+        access the Service such as a computer, a cellphone, or a digital tablet.
       </Text>
       <Text style={styles.para}>
         <Text style={styles.bold}>Feedback</Text> means feedback, innovations or
@@ -77,14 +77,14 @@ const TermsAndConditionsText: React.FC = () => {
         <Text style={styles.bold}>Service</Text> refers to the Application.
       </Text>
       <Text style={styles.para}>
-        <Text style={styles.bold}>Terms and Conditions</Text> (also referred as
-        "Terms") mean these Terms and Conditions that form the entire agreement
+        <Text style={styles.bold}>Terms of Service</Text> (also referred as
+        "Terms") mean these Terms of Service that form the entire agreement
         between You and the Company regarding the use of the Service.
       </Text>
       <Text style={styles.para}>
         <Text style={styles.bold}>Third-party Social Media Service</Text> means
-        any services or content (including data, information, products or
-        services) provided by a third-party that may be displayed, included or
+        any services or content (including data, information, products, or
+        services) provided by a third-party that may be displayed, included, or
         made available by the Service.
       </Text>
       <Text style={styles.para}>
@@ -94,21 +94,20 @@ const TermsAndConditionsText: React.FC = () => {
       </Text>
       <Text style={styles.heading}>Acknowledgement</Text>
       <Text style={styles.para}>
-        These are the Terms and Conditions governing the use of this Service and
-        the agreement that operates between You and the Company. These Terms and
-        Conditions set out the rights and obligations of all users regarding the
+        These are the Terms of Service governing the use of this Service and the
+        agreement that operates between You and the Company. These Terms of
+        Service set out the rights and obligations of all users regarding the
         use of the Service.
       </Text>
       <Text style={styles.para}>
         Your access to and use of the Service is conditioned on Your acceptance
-        of and compliance with these Terms and Conditions. These Terms and
-        Conditions apply to all visitors, users and others who access or use the
-        Service.
+        of and compliance with these Terms of Service. These Terms of Service
+        apply to all visitors, users and others who access or use the Service.
       </Text>
       <Text style={styles.para}>
         By accessing or using the Service You agree to be bound by these Terms
-        and Conditions. If You disagree with any part of these Terms and
-        Conditions then You may not access the Service.
+        of Service. If You disagree with any part of these Terms of Service then
+        You may not access the Service.
       </Text>
       <Text style={styles.para}>
         You represent that you are over the age of 13. The Company does not
@@ -246,6 +245,12 @@ const TermsAndConditionsText: React.FC = () => {
         content, including any errors or omissions in any content, or any loss
         or damage of any kind incurred as a result of your use of any content.
       </Text>
+      <Text style={styles.para}>
+        Tagg looks to foster a friendly network of users and therefore has a
+        zero-tolerance policy for abusive users. In the event that a user
+        exhibits objectionable or abusive behaviour, the Company shall remove
+        that user from the network immediately.
+      </Text>
       <Text style={styles.subHeading}>Content Backups</Text>
       <Text style={styles.para}>
         Although regular backups of Content are performed, the Company do not
@@ -267,6 +272,36 @@ const TermsAndConditionsText: React.FC = () => {
         You agree to maintain a complete and accurate copy of any Content in a
         location independent of the Service.
       </Text>
+      <Text style={styles.heading}>Software License</Text>
+      <Text style={styles.para}>
+        Any intellectual property rights, and any other exclusive rights on
+        software or technical applications embedded in or related to this
+        Application are held by the Company and/or its licensors.
+      </Text>
+      <Text style={styles.para}>
+        Subject to You the users' compliance with and notwithstanding any
+        divergent provision of these Terms, the Company merely grants You a
+        revocable, non-exclusive, non-sublicensable and non-transferable license
+        to use the software and/or any other technical means embedded in the
+        Service within the scope and for the purposes of this Application and
+        the Service offered.
+      </Text>
+      <Text style={styles.para}>
+        This license does not grant You any rights to access, usage, or
+        disclosure of the original source code. All techniques, algorithms, and
+        procedures contained in the software and any documentation thereto
+        related is the Company's or its licensors' sole property.
+      </Text>
+      <Text style={styles.para}>
+        Without prejudice to the above, under this license Users may download,
+        install, use, and run the Application
+      </Text>
+      <Text style={styles.para}>
+        The Company reserves the right to release updates, fixes, and further
+        developments of this Application and/or its related software and to
+        provide them to You. You may need to download and install such updates
+        to continue using this Application.
+      </Text>
       <Text style={styles.heading}>Copyright Policy</Text>
       <Text style={styles.subHeading}>Intellectual Property Infringement</Text>
       <Text style={styles.para}>
@@ -369,7 +404,7 @@ const TermsAndConditionsText: React.FC = () => {
       <Text style={styles.para}>
         We may terminate or suspend Your Account immediately, without prior
         notice or liability, for any reason whatsoever, including without
-        limitation if You breach these Terms and Conditions.
+        limitation if You breach these Terms of Service.
       </Text>
       <Text style={styles.para}>
         Upon termination, Your right to use the Service will cease immediately.
@@ -488,11 +523,11 @@ const TermsAndConditionsText: React.FC = () => {
       </Text>
       <Text style={styles.heading}>Translation Interpretation</Text>
       <Text style={styles.para}>
-        These Terms and Conditions may have been translated if We have made them
+        These Terms of Service may have been translated if We have made them
         available to You on our Service. You agree that the original English
         text shall prevail in the case of a dispute.
       </Text>
-      <Text style={styles.heading}>Changes to These Terms and Conditions</Text>
+      <Text style={styles.heading}>Changes to These Terms of Service</Text>
       <Text style={styles.para}>
         We reserve the right, at Our sole discretion, to modify or replace these
         Terms at any time. If a revision is material We will make reasonable
@@ -508,8 +543,8 @@ const TermsAndConditionsText: React.FC = () => {
       </Text>
       <Text style={styles.heading}>Contact Us</Text>
       <Text style={styles.para}>
-        If you have any questions about these Terms and Conditions, You can
-        contact us:
+        If you have any questions about these Terms of Service, You can contact
+        us:
       </Text>
       <Text style={styles.paraLeftAlign}>
         By email: <Text style={styles.link}>support@tagg.id</Text>
diff --git a/src/components/onboarding/TermsConditions.tsx b/src/components/onboarding/TermsConditions.tsx
index c653e63f..08cd8228 100644
--- a/src/components/onboarding/TermsConditions.tsx
+++ b/src/components/onboarding/TermsConditions.tsx
@@ -53,7 +53,7 @@ const TermsConditions: React.FC<TermsConditionsProps> = (props) => {
           <TouchableOpacity onPress={() => setModalVisible(true)}>
             <Text
               style={[styles.bodyPromptText, styles.bodyPromptTextUnderline]}>
-              terms and conditions.
+              EULA & Terms of Service
             </Text>
           </TouchableOpacity>
         </View>
@@ -65,7 +65,9 @@ const TermsConditions: React.FC<TermsConditionsProps> = (props) => {
               <ScrollView
                 style={styles.modalScrollView}
                 contentContainerStyle={styles.modalScrollViewContent}>
-                <Text style={styles.tcHeader}>Terms and Conditions</Text>
+                <Text style={styles.tcHeader}>
+                  End User License Agreement (EULA) & Terms of Service
+                </Text>
                 <TermsAndConditionsText />
               </ScrollView>
               <View style={styles.modalActions}>