Skip to content

Commit

Permalink
TermsAndConditions and PrivacyPolicy screens added (novasamatech#147)
Browse files Browse the repository at this point in the history
* TermsAndConditions and PrivacyPolicy screens added

* Checkboxes added

* Terms and Conditions added

* update privacy policy

* aggrement checkboxes implemented + privacy policy screen

* save Terms and conditions confirmation to the DB

* fix lists

* bump iOS version

* version added in ABOUT

* fix About crash on Android
  • Loading branch information
lexfrl authored Oct 6, 2018
1 parent af2e3a3 commit 5a27d2a
Show file tree
Hide file tree
Showing 12 changed files with 1,424 additions and 33 deletions.
5 changes: 3 additions & 2 deletions docs/privacy-policy.md → docs/privacy-policy.md.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

export default `
# Privacy Policy
Parity Technologies Limited (“**We**”; “**us**”; or “**our**”) are committed to protecting and respecting your privacy.
Expand All @@ -11,7 +11,7 @@ The Ethereum client written in the programming language Rust known as Parity doe
If you go to our Sites or utilise other services, we may collect and process the following personal data about you:
- **Information you give us**. This is information about you that you give us by filling in forms on our Sites, filling in forms on the sites of third party vendors providing us with a service, or by corresponding with us by phone, e-mail or otherwise. It includes information you provide when you agree to our contributors license agreement (“**CLA**”), apply to attend one of the events that we host, attend one of the events that we host, apply for a job on our Sites, ask to receive our newsletter and when you report a problem with our Sites. The information you give us may include your name, address, e-mail address and phone number and job application information (e.g. your CV, education data, and picture).
- **Information you give us**. This is information about you that you give us by filling in forms on our Sites, filling in forms on the sites of third party vendors providing us with a service, or by corresponding with us by phone, e-mail or otherwise. It includes information you provide when you agree to our contributors license agreement (“**CLA**”), apply to attend one of the events that we host, attend one of the events that we host, apply for a job on our Sites, ask to receive our newsletter and when you report a problem with our Sites. The information you give us may include your name, address, e-mail address and phone number and job application information (e.g. your CV, education data, and picture).
- **Information we collect about you**. With regard to each of your visits to our Sites we may automatically collect the following information:
- technical information, including the Internet protocol (IP) address used to connect your computer to the Internet, browser type and version, and versions, operating system and platform; and
Expand Down Expand Up @@ -223,3 +223,4 @@ Statutory information
- Registered Number: 09760015
- Registered Office: Ignition Law, Moray House Floor 1, 23-31 Great Titchfield Street, London, United Kingdom, WC1W 7PA.
`
28 changes: 14 additions & 14 deletions docs/terms-and-conditions.md → docs/terms-and-conditions.md.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ios/NativeSigner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>11</string>
<string>14</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"react-native": "0.55.3",
"react-native-camera": "^1.1.1",
"react-native-keyboard-aware-scroll-view": "^0.5.0",
"react-native-markdown-renderer": "^3.2.8",
"react-native-qrcode": "^0.2.6",
"react-native-secure-storage": "https://github.com/debris/react-native-secure-storage",
"react-native-simple-picker": "^2.1.0",
Expand Down
25 changes: 24 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ import AccountRecover from './screens/AccountRecover';
import AccountBackup from './screens/AccountBackup';
import AccountPin from './screens/AccountPin';
import About from './screens/About';
import TermsAndConditions from './screens/TermsAndConditions';
import PrivacyPolicy from './screens/PrivacyPolicy';
import AccountDetails from './screens/AccountDetails';
import AccountEdit from './screens/AccountEdit';
import TxDetails from './screens/TxDetails';
Expand Down Expand Up @@ -138,6 +140,27 @@ const Screens = createStackNavigator(
}
)
},
TocAndPrivacyPolicy: {
screen: createStackNavigator(
{
TermsAndConditions: {
screen: TermsAndConditions,
navigationOptions: {
headerLeft: <HeaderLeftHome />
}
},
PrivacyPolicy: {
screen: PrivacyPolicy
}
},
{
navigationOptions: globalStackNavigationOptions,
initialRouteParams: {
isWelcome: true
}
}
)
},
Welcome: {
screen: createStackNavigator(
{
Expand Down Expand Up @@ -260,7 +283,7 @@ const Screens = createStackNavigator(
},
{
headerMode: 'none',
mode: 'card',
mode: 'card'
// transitionConfig: (): Object => ({
// containerStyle: {
// backgroundColor: 'transparent'
Expand Down
52 changes: 52 additions & 0 deletions src/components/Markdown.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity 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.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

// @flow

import React from 'react';
import PropTypes from 'prop-types';
import { View, Text, Platform, StyleSheet } from 'react-native';
import { default as MarkdownRender } from 'react-native-markdown-renderer';
import colors from '../colors';

export default class Markdown extends React.PureComponent {
render() {
return (
<MarkdownRender
style={StyleSheet.create({
text: {
marginTop: 10,
fontFamily: 'Roboto',
fontSize: 14,
color: colors.card_bg
},
listUnorderedItemIcon: {
color: colors.card_bg,
fontWeight: "900",
marginRight: 3,
marginTop: 19
},
listOrderedItemIcon: {
color: colors.card_bg,
marginTop: 19,
marginRight: 3
}
})}
{...this.props}
/>
);
}
}
8 changes: 5 additions & 3 deletions src/screens/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class About extends React.PureComponent {
const isWelcome = navigation.getParam('isWelcome');
return (
<ScrollView style={styles.body} contentContainerStyle={{ padding: 20 }}>
<Text style={styles.title}>ABOUT</Text>
<Text style={styles.title}>PARITY SIGNER (v2.0-beta)</Text>
<View>
<Text style={styles.text}>
The Parity Signer mobile application is a secure air-gapped wallet
Expand All @@ -63,8 +63,10 @@ export default class About extends React.PureComponent {
app can be used to store any Ethereum account. This includes ETH,
ETC as well as Ether from various testnets (Kovan, Ropsten…).
</Text>
This app does not send any data to Parity Technologies or any partner.
The app works entirely offline once installed.
<Text style={styles.text}>
This app does not send any data to Parity Technologies or any
partner. The app works entirely offline once installed.
</Text>
<Text style={styles.text}>
The code of this application is available on Github (<Text
style={[styles.text, { textDecorationLine: 'underline' }]}
Expand Down
Loading

0 comments on commit 5a27d2a

Please sign in to comment.