Unverified Commit da508a88 authored by Marek Kotewicz's avatar Marek Kotewicz Committed by GitHub
Browse files

Merge pull request #102 from paritytech/react-update

[WIP] React and toolchain upgrade
parents 5b1fe47a 04a852b3
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { StyleSheet, View, ScrollView, Text, TextInput, TouchableOpacity } from 'react-native'
import AppStyles from '../styles'
import AccountIcon from './AccountIcon'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Image, View, StyleSheet } from 'react-native'
import { blockiesIcon } from '../util/native'
......
......@@ -16,8 +16,9 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import { Button, View, Text, ListView, RecyclerViewBackedScrollView, StatusBar, StyleSheet } from 'react-native'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Button, View, Text, ListView, StatusBar, StyleSheet } from 'react-native'
import AccountListRow from './AccountListRow'
import AppStyles from '../styles'
......@@ -82,7 +83,6 @@ export default class AccountList extends Component {
)
}}
enableEmptySections
renderScrollComponent={props => <RecyclerViewBackedScrollView {...props} />}
>
<StatusBar barStyle='light-content' />
</ListView>
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { TouchableHighlight, StyleSheet, View, Text } from 'react-native'
import AppStyles from '../styles'
import AccountIcon from './AccountIcon'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { TextInput, View, Button, StyleSheet, KeyboardAvoidingView } from 'react-native'
import AppStyles from '../styles'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes} from 'react'
import React, { Component} from 'react'
import PropTypes from 'prop-types'
import { Text, View, StyleSheet } from 'react-native'
import AppStyles from '../styles'
import AccountIcon from './AccountIcon'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { TextInput, StyleSheet } from 'react-native'
export default class AccountSeed extends Component {
......
......@@ -28,7 +28,7 @@ import AccountNew from '../containers/AccountNew'
import AccountDetails from '../containers/AccountDetails'
import TxDetails from '../containers/TxDetails'
import { AccountEnterPin, AccountChangePin, AccountSetPin, AccountConfirmPin } from '../containers/AccountPin'
import { QrViewTransaction, QrViewAddress } from '../containers/QrView'
import { QrViewTransaction } from '../containers/QrView'
import DataDetails from '../containers/DataDetails'
import { loadAccounts, saveAccounts } from '../util/db'
import { setAccounts } from '../actions/accounts'
......@@ -63,7 +63,7 @@ const accountScenes =
onBack={() => Alert.alert('Do you want to cancel account creation?', undefined, [{
text: 'Yes',
onPress: () => {
Actions.popTo('right')
Actions.popTo('_right')
}
}, {
text: 'No',
......@@ -93,11 +93,11 @@ const accountScenes =
backButtonTextStyle={styles.navibarTitle}
hideBackImage
/>
<Scene key='qrViewAddress' title='Address QR' component={QrViewAddress}
{/* <Scene key='qrViewAddress' title='Address QR' component={QrViewAddress}
backTitle='Back'
backButtonTextStyle={styles.navibarTitle}
hideBackImage
/>
/> */}
<Scene key='iconChooser' title='Choose an Icon' component={IconChooser}
backTitle='Back'
backButtonTextStyle={styles.navibarTitle}
......@@ -108,7 +108,7 @@ const accountScenes =
const scenes =
<Scene key='root'>
<Scene key='tabs' tabs style={styles.tabbar}>
<Scene key='left' title='Scan Transaction QR' initial icon={TabIcon} navigationBarStyle={styles.navibar} titleStyle={styles.navibarTitle}>
<Scene key='_left' title='Scan Transaction QR' initial icon={TabIcon} navigationBarStyle={styles.navibar} titleStyle={styles.navibarTitle}>
<Scene key='qrScan'
component={QrScanner}
title='Scan Transaction QR'
......@@ -129,7 +129,7 @@ const scenes =
hideBackImage
/>
<Scene key='qrViewTx' title='Signature QR' component={QrViewTransaction}
onRight={() => Actions.popTo('left')}
onRight={() => Actions.popTo('_left')}
rightTitle='Done'
rightButtonTextStyle={styles.navibarTitle}
backTitle='Back'
......@@ -137,7 +137,7 @@ const scenes =
hideBackImage
/>
</Scene>
<Scene key='right' title='Accounts' icon={TabIcon} navigationBarStyle={styles.navibar} titleStyle={styles.navibarTitle}>
<Scene key='_right' title='Accounts' icon={TabIcon} navigationBarStyle={styles.navibar} titleStyle={styles.navibarTitle}>
{accountScenes.props.children}
</Scene>
</Scene>
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { View, Button, Text } from 'react-native'
import AppStyles from '../styles'
......
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Button, View, ScrollView, StyleSheet, TouchableOpacity } from 'react-native'
import AppStyles from '../styles'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { StyleSheet, View, StatusBar } from 'react-native'
import Camera from 'react-native-camera'
import AppStyles from '../styles'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { View, StyleSheet } from 'react-native'
import QRCode from 'react-native-qrcode'
import AppStyles from '../styles'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Text, StyleSheet } from 'react-native'
export default class TabIcon extends Component {
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { ScrollView, View, Text, Button } from 'react-native'
import AppStyles from '../styles'
import AccountPrettyAddress from './AccountPrettyAddress'
......
......@@ -16,7 +16,8 @@
'use strict'
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import {
ScrollView, View, Text, TextInput, Button, TouchableOpacity, Share
} from 'react-native'
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment