This commit is contained in:
feruz 2020-08-19 15:09:22 +03:00
parent ad951122cf
commit 1ce582ddca
7 changed files with 34 additions and 8 deletions

View File

@ -41,6 +41,9 @@ PODS:
- FirebaseAnalytics (= 6.6.2)
- Firebase/CoreOnly (6.28.1):
- FirebaseCore (= 6.9.1)
- Firebase/DynamicLinks (6.28.1):
- Firebase/CoreOnly
- FirebaseDynamicLinks (~> 4.2.0)
- Firebase/Messaging (6.28.1):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.6.0)
@ -62,6 +65,8 @@ PODS:
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- nanopb (~> 1.30905.0)
- FirebaseDynamicLinks (4.2.0):
- FirebaseCore (~> 6.8)
- FirebaseInstallations (1.5.0):
- FirebaseCore (~> 6.8)
- GoogleUtilities/Environment (~> 6.7)
@ -371,6 +376,11 @@ PODS:
- RNFBApp (8.3.0):
- Firebase/CoreOnly (~> 6.28.1)
- React
- RNFBDynamicLinks (7.4.2):
- Firebase/Analytics (~> 6.28.1)
- Firebase/DynamicLinks (~> 6.28.1)
- React
- RNFBApp
- RNFBMessaging (7.6.1):
- Firebase/Analytics (~> 6.28.1)
- Firebase/Messaging (~> 6.28.1)
@ -453,6 +463,7 @@ DEPENDENCIES:
- RNFastImage (from `../node_modules/react-native-fast-image`)
- "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)"
- "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
- "RNFBDynamicLinks (from `../node_modules/@react-native-firebase/dynamic-links`)"
- "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- RNIap (from `../node_modules/react-native-iap`)
@ -473,6 +484,7 @@ SPEC REPOS:
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseDynamicLinks
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
@ -579,6 +591,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-firebase/analytics"
RNFBApp:
:path: "../node_modules/@react-native-firebase/app"
RNFBDynamicLinks:
:path: "../node_modules/@react-native-firebase/dynamic-links"
RNFBMessaging:
:path: "../node_modules/@react-native-firebase/messaging"
RNGestureHandler:
@ -616,6 +630,7 @@ SPEC CHECKSUMS:
FirebaseAnalytics: 5fa308e1b13f838d0f6dc74719ac2a72e8c5afc4
FirebaseCore: 687b8e6a0a4337b898a6326d68254c2f80c143af
FirebaseCoreDiagnostics: 7535fe695737f8c5b350584292a70b7f8ff0357b
FirebaseDynamicLinks: cf3cfedfd47ce6ea56fa66a5c940ea0ca9c60950
FirebaseInstallations: 3c520c951305cbf9ca54eb891ff9e6d1fd384881
FirebaseInstanceID: 358d5cb393d2750a745569ede06827c35aea530b
FirebaseMessaging: bdd4d573eab37ebee29bad4e7c4b0ef18fa1a952
@ -664,6 +679,7 @@ SPEC CHECKSUMS:
RNFastImage: e19ba191922e7dab9d932a4d59d62d76660aa222
RNFBAnalytics: 43b6cdfb3f3c8ddd4425260aa246a5f73d7f71c3
RNFBApp: d55b3a69d199cff25ecf4f3bf41a86c47aa37d57
RNFBDynamicLinks: 25fd455b8f47be4fc7e92bd80db17d448196e9ba
RNFBMessaging: 3bb7dcf398789ce359a9f6b97b83472a3090f65a
RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08
RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4

View File

@ -43,6 +43,7 @@
"@react-native-community/toolbar-android": "^0.1.0-rc.2",
"@react-native-firebase/analytics": "^7.3.1",
"@react-native-firebase/app": "^8.2.0",
"@react-native-firebase/dynamic-links": "^7.4.2",
"@react-native-firebase/messaging": "^7.4.2",
"appcenter": "^3.1.0",
"appcenter-analytics": "^3.1.0",

View File

@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
import { View, Text } from 'react-native';
import { View, Text, TouchableOpacity, Linking } from 'react-native';
import Ionicons from 'react-native-vector-icons/Ionicons';
// Constants
@ -27,13 +27,15 @@ class FormInputView extends PureComponent {
// Component Functions
render() {
const { description, iconName, bold } = this.props;
const { description, iconName, bold, link } = this.props;
return (
<View style={styles.container}>
<Ionicons color="#c1c5c7" style={styles.infoIcon} name={iconName} />
<Text style={[styles.infoText, bold && styles.bold]}>{description}</Text>
</View>
<TouchableOpacity onPress={() => Linking.openURL(link)}>
<View style={styles.container}>
<Ionicons color="#c1c5c7" style={styles.infoIcon} name={iconName} />
<Text style={[styles.infoText, bold && styles.bold]}>{description}</Text>
</View>
</TouchableOpacity>
);
}
}

View File

@ -216,7 +216,7 @@
"signin_title": "To get all the benefits of using Ecency",
"username": "Username",
"password": "Password or WIF",
"description": "User credentials are kept locally on the device. Credentials are removed upon logout!",
"description": "By loggin in, you agree to our Terms of Services and Privacy Policies.",
"cancel": "cancel",
"login": "LOGIN",
"steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.",
@ -230,7 +230,7 @@
"ref_user": "Referred user (Optional)",
"500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...",
"title_description": "One account to manage everything",
"form_description": "After registeration, you will receive an email with further instructions"
"form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies."
},
"home": {
"feed": "Feed",

View File

@ -139,6 +139,7 @@ class LoginScreen extends PureComponent {
description={intl.formatMessage({
id: 'login.description',
})}
link="https://ecency.com/terms-of-service"
iconName="ios-information-circle-outline"
/>
</KeyboardAwareScrollView>

View File

@ -141,6 +141,7 @@ const RegisterScreen = ({ navigation }) => {
<InformationArea
description={intl.formatMessage({ id: 'register.form_description' })}
iconName="ios-information-circle-outline"
link="https://ecency.com/terms-of-service"
/>
</KeyboardAwareScrollView>

View File

@ -1189,6 +1189,11 @@
opencollective-postinstall "^2.0.1"
superstruct "^0.6.2"
"@react-native-firebase/dynamic-links@^7.4.2":
version "7.4.2"
resolved "https://registry.yarnpkg.com/@react-native-firebase/dynamic-links/-/dynamic-links-7.4.2.tgz#8077b20a04cdcc944478c6500ea5a7b46a91df5e"
integrity sha512-zBSQUxDfnPudFSKM9uhYj51zfXz7g8A3RedSriZzBJg2gWtrku7JyrUpuCoY41EGkTccKQqhTeZsVERsiciXoA==
"@react-native-firebase/messaging@^7.4.2":
version "7.6.1"
resolved "https://registry.yarnpkg.com/@react-native-firebase/messaging/-/messaging-7.6.1.tgz#93a6d231b56e5d4420fc242b10aecacade58677f"