Merge branch '289-bug-links-in-about-don-t-work-on-swift-phone' into 'master'

Resolve "[Bug] links in about don't work on swift phone"

Closes #289

See merge request bloodyhealth/drip!159

components/helpers/replace-url-with-text.js

@@ -2,5 +2,8 @@ import {links} from '../../i18n/en/settings'
 
 export default function(url) {
   const link = Object.values(links).find(link => link.url === url)
+  if (url === 'mailto:bloodyhealth@mailbox.org') {
+    console.log(links.email.url === url)
+  }
   return link ? link.text : url
 }
\ No newline at end of file

components/license.js

@@ -13,7 +13,7 @@ const labels = settingsLabels.license
 export default function License({setLicense}) {
   return (
     <ScrollView style={styles.licensePage}>
-      <Hyperlink linkStyle={styles.link} linkText={replace}>
+      <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
         <AppText style={styles.settingsSegmentTitle}>{labels.title}</AppText>
         <AppText>{labels.text}</AppText>
       </Hyperlink>

components/settings/about.js

@@ -12,7 +12,7 @@ export default class AboutSection extends Component {
     return (
       <ScrollView>
         <SettingsSegment title={labels.aboutSection.title}>
-          <Hyperlink linkStyle={styles.link} linkText={replace}>
+          <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
             <AppText>{labels.aboutSection.text}</AppText>
           </Hyperlink>
         </SettingsSegment>
@@ -23,7 +23,7 @@ export default class AboutSection extends Component {
           <AppText>{labels.credits.note}</AppText>
         </SettingsSegment>
         <SettingsSegment title={labels.website.title}>
-          <Hyperlink linkStyle={styles.link}>
+          <Hyperlink linkStyle={styles.link} linkDefault>
             <AppText>{links.website.url}</AppText>
           </Hyperlink>
         </SettingsSegment>

components/settings/license.js

@@ -11,7 +11,7 @@ export default class License extends Component {
     return (
       <ScrollView>
         <View style={styles.settingsSegment}>
-          <Hyperlink linkStyle={styles.link} linkText={replace}>
+          <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
             <AppText style={styles.settingsSegmentTitle}>{`${labels.license.title} `}</AppText>
             <AppText>{`${labels.license.text} `}</AppText>
           </Hyperlink>

components/settings/nfp-settings/index.js

@@ -33,7 +33,7 @@ export default class Settings extends Component {
             <Icon name="info-with-circle" style={iconStyles.infoInHeading}/>
             <AppText style={styles.settingsSegmentTitle}>{`${labels.preOvu.title} `}</AppText>
           </View>
-          <Hyperlink linkStyle={styles.link} linkText={replaceUrlWithText}>
+          <Hyperlink linkStyle={styles.link} linkText={replaceUrlWithText} linkDefault>
             <AppText>{labels.preOvu.note}</AppText>
           </Hyperlink>
         </SettingsSegment>

i18n/en/settings.js

@@ -5,7 +5,7 @@ export const links = {
     text: 'GitLab'
   },
   email: {
-    url: 'mailto:bl00dyhealth@mailbox.org',
+    url: 'mailto:bloodyhealth@mailbox.org',
     text: 'email'
   },
   wiki: {
@@ -124,7 +124,7 @@ export default {
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html 
 
-You can contact us by email at bloodyhealth@mailbox.com.`
+You can contact us by bloodyhealth@mailbox.org.`
   },
   version: {
     title: 'Version'