Skip to content

Commit

Permalink
Import private key (#413)
Browse files Browse the repository at this point in the history
* import private key working

* use flatlist

* bump gaba

* clean up and android fixes

* more android fixes

* update snapshots
  • Loading branch information
Bruno Barbieri authored Feb 19, 2019
1 parent c961dbe commit 7bee2ca
Show file tree
Hide file tree
Showing 32 changed files with 1,018 additions and 162 deletions.
Binary file added android/app/src/main/assets/fonts/AntDesign.ttf
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/Entypo.ttf
100644 → 100755
Empty file.
Binary file modified android/app/src/main/assets/fonts/EvilIcons.ttf
100644 → 100755
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/FontAwesome.ttf
100644 → 100755
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/Foundation.ttf
100644 → 100755
Empty file.
Binary file modified android/app/src/main/assets/fonts/Ionicons.ttf
100644 → 100755
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
100644 → 100755
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/MaterialIcons.ttf
100644 → 100755
Empty file.
Binary file modified android/app/src/main/assets/fonts/Octicons.ttf
100644 → 100755
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/SimpleLineIcons.ttf
100644 → 100755
Empty file.
Empty file modified android/app/src/main/assets/fonts/Zocial.ttf
100644 → 100755
Empty file.
26 changes: 26 additions & 0 deletions app/components/Nav/App/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ exports[`App should render correctly 1`] = `
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"ImportPrivateKeyView": Object {
"childRouters": Object {
"ImportPrivateKey": null,
"ImportPrivateKeySuccess": null,
},
"getActionCreators": [Function],
"getActionForPathAndParams": [Function],
"getComponentForRouteName": [Function],
"getComponentForState": [Function],
"getPathAndParamsForState": [Function],
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"LockScreen": null,
"QRScanner": null,
"SendView": Object {
Expand Down Expand Up @@ -297,6 +310,19 @@ exports[`App should render correctly 1`] = `
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"ImportPrivateKeyView": Object {
"childRouters": Object {
"ImportPrivateKey": null,
"ImportPrivateKeySuccess": null,
},
"getActionCreators": [Function],
"getActionForPathAndParams": [Function],
"getComponentForRouteName": [Function],
"getComponentForState": [Function],
"getPathAndParamsForState": [Function],
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"LockScreen": null,
"QRScanner": null,
"SendView": Object {
Expand Down
26 changes: 26 additions & 0 deletions app/components/Nav/Main/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ exports[`Main should render correctly 1`] = `
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"ImportPrivateKeyView": Object {
"childRouters": Object {
"ImportPrivateKey": null,
"ImportPrivateKeySuccess": null,
},
"getActionCreators": [Function],
"getActionForPathAndParams": [Function],
"getComponentForRouteName": [Function],
"getComponentForState": [Function],
"getPathAndParamsForState": [Function],
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"LockScreen": null,
"QRScanner": null,
"SendView": Object {
Expand Down Expand Up @@ -204,6 +217,19 @@ exports[`Main should render correctly 1`] = `
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"ImportPrivateKeyView": Object {
"childRouters": Object {
"ImportPrivateKey": null,
"ImportPrivateKeySuccess": null,
},
"getActionCreators": [Function],
"getActionForPathAndParams": [Function],
"getComponentForRouteName": [Function],
"getComponentForState": [Function],
"getPathAndParamsForState": [Function],
"getScreenOptions": [Function],
"getStateForAction": [Function],
},
"LockScreen": null,
"QRScanner": null,
"SendView": Object {
Expand Down
17 changes: 17 additions & 0 deletions app/components/Nav/Main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import AccountBackupStep3 from '../../Views/AccountBackupStep3';
import AccountBackupStep4 from '../../Views/AccountBackupStep4';
import AccountBackupStep5 from '../../Views/AccountBackupStep5';
import AccountBackupStep6 from '../../Views/AccountBackupStep6';
import ImportPrivateKey from '../../Views/ImportPrivateKey';
import ImportPrivateKeySuccess from '../../Views/ImportPrivateKeySuccess';

const styles = StyleSheet.create({
flex: {
Expand Down Expand Up @@ -102,6 +104,21 @@ const MainNavigator = createStackNavigator(
}
})
},
ImportPrivateKeyView: {
screen: createStackNavigator(
{
ImportPrivateKey: {
screen: ImportPrivateKey
},
ImportPrivateKeySuccess: {
screen: ImportPrivateKeySuccess
}
},
{
headerMode: 'none'
}
)
},
SendView: {
screen: createStackNavigator({
Send: {
Expand Down
Loading

0 comments on commit 7bee2ca

Please sign in to comment.