diff --git a/src/constants/SceneKeys.js b/src/constants/SceneKeys.js
new file mode 100644
index 00000000000..ab26357a8ef
--- /dev/null
+++ b/src/constants/SceneKeys.js
@@ -0,0 +1,16 @@
+export const LOGIN = 'login'
+export const CHANGE_PASSWORD = 'changePassword'
+export const CAHNGE_PIN = 'changePin'
+export const RECOVER_PASSWORD = 'passwordRecovery'
+export const EDGE = 'edge'
+export const WALLET_LIST = 'walletList'
+export const CREATE_WALLET = 'createWallet'
+export const TRANSACTION_LIST = 'transactionList'
+export const TRANSACTION_DETAILS = 'transactionDetails'
+export const SCAN = 'scan'
+export const SEND_CONFIRMATION = 'sendConfirmation'
+export const REQUEST = 'request'
+export const SETTINGS_OVERVIEW = 'settingsOverview'
+export const BTC_SETTINGS = 'btcSettings'
+export const ETH_SETTINGS = 'ethSettings'
+export const DIRECTORY= 'directory'
diff --git a/src/constants/index.js b/src/constants/index.js
new file mode 100644
index 00000000000..7051510168b
--- /dev/null
+++ b/src/constants/index.js
@@ -0,0 +1,2 @@
+export * from './SceneKeys'
+
diff --git a/src/modules/Container.ui.js b/src/modules/Container.ui.js
index da389e45a3d..95a6efaa459 100644
--- a/src/modules/Container.ui.js
+++ b/src/modules/Container.ui.js
@@ -9,8 +9,11 @@ import {MenuContext} from 'react-native-menu'
import getTheme from '../theme/components'
import platform from '../theme/variables/platform'
import Locale from 'react-native-locale'
-
+import * as Constants from '../constants'
import Login from './UI/scenes/Login/Login.ui'
+import ChangePasswordConnector from './UI/scenes/ChangePinPassword/ChangePasswordConnector.ui'
+import ChangePinConnector from './UI/scenes/ChangePinPassword/ChangePinConnector.ui'
+import PasswordRecoveryConnector from './UI/scenes/PasswordRecovery/PasswordRecoveryConnector.ui'
import Layout from './UI/scenes/layout/Layout.ui'
import TransactionListConnect from './UI/scenes/TransactionList'
import TransactionDetails from './UI/scenes/TransactionDetails'
@@ -124,32 +127,35 @@ class Main extends Component {
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/src/modules/UI/scenes/ChangePinPassword/ChangePasswordComponent.ui.js b/src/modules/UI/scenes/ChangePinPassword/ChangePasswordComponent.ui.js
new file mode 100644
index 00000000000..234b20fade5
--- /dev/null
+++ b/src/modules/UI/scenes/ChangePinPassword/ChangePasswordComponent.ui.js
@@ -0,0 +1,19 @@
+import React, {Component} from 'react'
+import {ChangePasswordScreen} from 'airbitz-core-js-ui'
+
+export default class ChangePassword extends Component {
+ onComplete = () => {
+ this.props.onComplete()
+ }
+
+ render () {
+ return (
+
+ )
+ }
+}
diff --git a/src/modules/UI/scenes/ChangePinPassword/ChangePasswordConnector.ui.js b/src/modules/UI/scenes/ChangePinPassword/ChangePasswordConnector.ui.js
new file mode 100644
index 00000000000..4d62e281d37
--- /dev/null
+++ b/src/modules/UI/scenes/ChangePinPassword/ChangePasswordConnector.ui.js
@@ -0,0 +1,16 @@
+import {connect} from 'react-redux'
+import * as CORE_SELECTORS from '../../../Core/selectors.js'
+import {Actions} from 'react-native-router-flux'
+import ChangePasswordComponent from './ChangePasswordComponent.ui'
+import * as Constants from '../../../../constants'
+
+export const mapStateToProps = (state) => ({
+ context: CORE_SELECTORS.getContext(state),
+ accountObject: CORE_SELECTORS.getAccount(state)
+})
+
+export const mapDispatchToProps = () => ({
+ onComplete: () => Actions[Constants.SETTINGS_OVERVIEW]()
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(ChangePasswordComponent)
diff --git a/src/modules/UI/scenes/ChangePinPassword/ChangePinComponent.ui.js b/src/modules/UI/scenes/ChangePinPassword/ChangePinComponent.ui.js
new file mode 100644
index 00000000000..c8439dbf61f
--- /dev/null
+++ b/src/modules/UI/scenes/ChangePinPassword/ChangePinComponent.ui.js
@@ -0,0 +1,19 @@
+import React, {Component} from 'react'
+import {ChangePinScreen} from 'airbitz-core-js-ui'
+
+export default class ChangePassword extends Component {
+ onComplete = () => {
+ this.props.onComplete()
+ }
+
+ render () {
+ return (
+
+ )
+ }
+}
diff --git a/src/modules/UI/scenes/ChangePinPassword/ChangePinConnector.ui.js b/src/modules/UI/scenes/ChangePinPassword/ChangePinConnector.ui.js
new file mode 100644
index 00000000000..b9d096156be
--- /dev/null
+++ b/src/modules/UI/scenes/ChangePinPassword/ChangePinConnector.ui.js
@@ -0,0 +1,16 @@
+import {connect} from 'react-redux'
+import * as CORE_SELECTORS from '../../../Core/selectors.js'
+import {Actions} from 'react-native-router-flux'
+import ChangePinComponent from './ChangePinComponent.ui'
+import * as Constants from '../../../../constants'
+
+export const mapStateToProps = (state) => ({
+ context: CORE_SELECTORS.getContext(state),
+ accountObject: CORE_SELECTORS.getAccount(state)
+})
+
+export const mapDispatchToProps = () => ({
+ onComplete: () => Actions[Constants.SETTINGS_OVERVIEW]()
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(ChangePinComponent)
diff --git a/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryComponent.ui.js b/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryComponent.ui.js
new file mode 100644
index 00000000000..cd6b89f0bce
--- /dev/null
+++ b/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryComponent.ui.js
@@ -0,0 +1,19 @@
+import React, {Component} from 'react'
+import {PasswordRecoveryScreen} from 'airbitz-core-js-ui'
+
+export default class PasswordRecovery extends Component {
+ onComplete = () => {
+ this.props.onComplete()
+ }
+
+ render () {
+ return (
+
+ )
+ }
+}
diff --git a/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryConnector.ui.js b/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryConnector.ui.js
new file mode 100644
index 00000000000..3c27158b00e
--- /dev/null
+++ b/src/modules/UI/scenes/PasswordRecovery/PasswordRecoveryConnector.ui.js
@@ -0,0 +1,16 @@
+import {connect} from 'react-redux'
+import * as CORE_SELECTORS from '../../../Core/selectors.js'
+import {Actions} from 'react-native-router-flux'
+import PasswordRecoveryComponent from './PasswordRecoveryComponent.ui'
+import * as Constants from '../../../../constants'
+
+export const mapStateToProps = (state) => ({
+ context: CORE_SELECTORS.getContext(state),
+ accountObject: CORE_SELECTORS.getAccount(state)
+})
+
+export const mapDispatchToProps = () => ({
+ onComplete: () => Actions[Constants.SETTINGS_OVERVIEW]()
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(PasswordRecoveryComponent)
diff --git a/src/modules/UI/scenes/Settings/SettingsOverview.ui.js b/src/modules/UI/scenes/Settings/SettingsOverview.ui.js
index 9d0b01ca98d..cdd9d7ea04b 100644
--- a/src/modules/UI/scenes/Settings/SettingsOverview.ui.js
+++ b/src/modules/UI/scenes/Settings/SettingsOverview.ui.js
@@ -10,6 +10,7 @@ import FAIcon from 'react-native-vector-icons/FontAwesome'
import IonIcon from 'react-native-vector-icons/Ionicons'
import LinearGradient from 'react-native-linear-gradient'
+import * as Constants from '../../../../constants'
import strings from '../../../../locales/default'
import T from '../../components/FormattedText'
import RowModal from './components/RowModal.ui'
@@ -34,20 +35,19 @@ class SettingsOverview extends Component {
this.settings = [
{
- key: 'changePassword',
+ key: Constants.CHANGE_PASSWORD,
text: sprintf(strings.enUS['settings_button_change_password']),
- routeFunction: this._onPressDummyRouting
+ routeFunction: this._onPressChangePasswordRouting
}, {
- key: 'changePin',
+ key: Constants.CAHNGE_PIN,
text: sprintf(strings.enUS['settings_button_pin']),
- routeFunction: this._onPressDummyRouting
+ routeFunction: this._onPressChangePinRouting
}, {
- key: 'passwordRecovery',
+ key: Constants.RECOVER_PASSWORD,
text: sprintf(strings.enUS['settings_button_change_pass_recovery']),
- routeFunction: this._onPressDummyRouting
+ routeFunction: this._onPressRecoverPasswordRouting
}
]
-
this.securityRoute = [
{
key: 'setup2Factor',
@@ -93,14 +93,16 @@ class SettingsOverview extends Component {
]
}
- _handleOnPressRouting = (route) => {
- console.log('in SettingsOverview.ui.js, route is: ', route)
- let goRoute = Actions[route]
- goRoute()
+ _onPressChangePasswordRouting = () => {
+ Actions[Constants.CHANGE_PASSWORD]()
}
- _onPressDummyRouting = () => {
- console.log('dummy routing')
+ _onPressChangePinRouting = () => {
+ Actions[Constants.CAHNGE_PIN]()
+
+ }
+ _onPressRecoverPasswordRouting = () => {
+ Actions[Constants.CHANGE_PASSWORD]()
}
_onPressOpenLogoffTime = () => {