Skip to content

Commit

Permalink
Merge pull request #32 from polkawallet-io/develop0222
Browse files Browse the repository at this point in the history
Settings&&Set_Node&update polkadot/[email protected]
  • Loading branch information
0xthreebody authored Feb 22, 2019
2 parents bc02218 + 029741b commit 965076c
Show file tree
Hide file tree
Showing 28 changed files with 514 additions and 167 deletions.
4 changes: 4 additions & 0 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import Preferences from './src/code/Staking/secondary/preferences'
import Change_Password from './src/code/Profile/secondary/Change/Change_Password'
import Change_Name from './src/code/Profile/secondary/Change/Change_Name'
import NayorAye from './src/code/Democracy/secondary/NayorAye'
import Settings from './src/code/Profile/secondary/Settings'
import Set_Node from './src/code/Profile/secondary/Settings/Set_Node'



Expand Down Expand Up @@ -58,6 +60,8 @@ const Polkawallet_App = StackNavigator({
Change_Password:{screen:Change_Password,navigationOptions:{header:null}},
Change_Name:{screen:Change_Name,navigationOptions:{header:null}},
NayorAye:{screen:NayorAye,navigationOptions:{header:null}},
Settings:{screen:Settings,navigationOptions:{header:null}},
Set_Node:{screen:Set_Node,navigationOptions:{header:null}},

})

Expand Down
2 changes: 1 addition & 1 deletion ios/Polkawallet/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>1.2</string>
<string>1.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
175 changes: 109 additions & 66 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@babel/plugin-proposal-decorators": "^7.2.3",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/runtime": "^7.2.0",
"@polkadot/api": "^0.45.8",
"@polkadot/api": "^0.45.12",
"@tradle/react-native-http": "^2.0.1",
"browserify-zlib": "^0.1.4",
"buffer": "^4.9.1",
Expand Down
8 changes: 8 additions & 0 deletions src/code/Assetes/secondary/Backup_Account.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ import {
Picker,
Clipboard
} from 'react-native';
import Api from '@polkadot/api/promise';
import WsProvider from '@polkadot/rpc-provider/ws';

let ScreenWidth = Dimensions.get("screen").width;
let ScreenHeight = Dimensions.get("screen").height;
import { observer, inject } from "mobx-react";
@inject('rootStore')
@observer
export default class Polkawallet extends Component{
constructor(props)
{
Expand All @@ -30,6 +36,8 @@ export default class Polkawallet extends Component{
this.props.navigation.navigate('Create_Account')
}
Continue(){
this.props.rootStore.stateStore.isvalidators=0
this.props.rootStore.stateStore.StakingState=0
this.props.navigation.navigate('Tabbed_Navigation')
}
async copy(){
Expand Down
4 changes: 1 addition & 3 deletions src/code/Assetes/secondary/Create_Account.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ export default class Polkawallet extends Component {
this.props.navigation.navigate('Backup_Account',{key:this.state.key})

}else{
// /*
this.pair.setMeta({'name':this.state.name})
this.json = this.pair.toJson(this.state.password)
this.json.meta = this.pair.getMeta()
Expand All @@ -204,7 +203,6 @@ export default class Polkawallet extends Component {
this.props.rootStore.stateStore.Accountnum++
this.props.rootStore.stateStore.Account=this.props.rootStore.stateStore.Accountnum
this.props.navigation.navigate('Backup_Account',{key:this.state.key})
// */
}
}
else{
Expand Down Expand Up @@ -275,7 +273,7 @@ export default class Polkawallet extends Component {
}}
>
<View style={[styles.middle,{flex:1}]}>
<Text style={{color:'white'}}>{this.state.way}</Text>
<Text style={{fontSize:ScreenWidth/30,color:'white'}}>{this.state.way}</Text>
</View>
<Image
style={{backgroundColor:'white',marginRight:1,height:ScreenHeight/23-2,width:ScreenHeight/35,resizeMode:'center'}}
Expand Down
Loading

0 comments on commit 965076c

Please sign in to comment.