Merge pull request #40 from ademcan/master

Small UI fixes and new tag 1.0.6
theQRL · Jan 25, 2019 · dafe8fb · dafe8fb
2 parents 8e035fd + 8a0e37f
commit dafe8fb
Show file tree

Hide file tree

Showing 24 changed files with 302 additions and 296 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -126,7 +126,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0.5"
+        versionName "1.0.6"
 
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/android/app/src/main/assets/index.android.bundle.meta b/android/app/src/main/assets/index.android.bundle.meta
@@ -1 +1 @@
-�����7_�8�Aw�s��&
+��/�eFC6�s_ֆ�SI��o
diff --git a/...drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/...s/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/...s/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/android/app/src/main/res/drawable-mdpi/resources_images_fund_bg.png b/android/app/src/main/res/drawable-mdpi/resources_images_fund_bg.png
diff --git a/android/app/src/main/res/drawable-mdpi/resources_images_lower_drawer_bg.png b/android/app/src/main/res/drawable-mdpi/resources_images_lower_drawer_bg.png
diff --git a/...rawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...rawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/.../drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/.../drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/...awable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...awable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/...drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/...drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/ios/theQRL.xcodeproj/xcshareddata/xcschemes/theQRL.xcscheme b/ios/theQRL.xcodeproj/xcshareddata/xcschemes/theQRL.xcscheme
@@ -80,7 +80,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

diff --git a/ios/theQRL/Info.plist b/ios/theQRL/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/screens/BackupWallet.js b/screens/BackupWallet.js
@@ -100,7 +100,7 @@ export default class BackupWallet extends React.Component {
             <View style={{flex:1}}>
 
                 <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                    <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='white'>
+                    <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                         <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                     </TouchableHighlight>
                 </View>

diff --git a/screens/CreateNewWallet.js b/screens/CreateNewWallet.js
@@ -158,11 +158,6 @@ export default class CreateNewWallet extends React.Component {
                             </TouchableHighlight>                    
                         </View>
                     </View>
-                    {rowID < this.state.walletlist.length - 1 ? 
-                        <View style={{height: .5,width: "90%",backgroundColor: "#000",alignSelf:'center'}}/>
-                        :
-                        undefined
-                    }
                 </View>
             );
         }
@@ -193,7 +188,7 @@ export default class CreateNewWallet extends React.Component {
               <ImageBackground source={require('../resources/images/sendreceive_bg_half.png')} style={styles.backgroundImage}>
                 <View style={{flex:1}}>
                     <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                        <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='white'>
+                        <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                           <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                         </TouchableHighlight>
                     </View>

diff --git a/screens/OpenExistingWallet.js b/screens/OpenExistingWallet.js
@@ -15,8 +15,8 @@ export default class OpenExistingWallet extends React.Component {
     componentDidMount(){
         const hexseed = this.props.navigation.getParam('hexseed', 'nohexseed');
         if (hexseed == "nohexseed"){
-            // this.setState({hexseed: "" })
-            this.setState({ hexseed: GLOBALS.hexseed1 })
+            this.setState({hexseed: "" })
+            // this.setState({ hexseed: GLOBALS.hexseed1 })
         }
         else {
             this.setState({hexseed: hexseed})

diff --git a/screens/SendReceive.js b/screens/SendReceive.js
@@ -28,8 +28,8 @@ export default class SendReceive extends React.Component {
     componentDidMount() {
         const recipient = this.props.navigation.getParam('recipient', 'norecipient');
         if (recipient == "norecipient"){
-            // this.setState({recipient:""})
-            this.setState({recipient: GLOBALS.recipient })
+            this.setState({recipient:""})
+            // this.setState({recipient: GLOBALS.recipient })
         }
         else {
             this.setState({recipient:recipient})
@@ -214,15 +214,15 @@ export default class SendReceive extends React.Component {
 
                     <ImageBackground source={require('../resources/images/sendreceive_bg_half.png')} style={styles.backgroundImage}>
                         <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} activeOpacity={1}>
+                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                                 <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                             </TouchableHighlight>
                         </View>
                         <FlashMessage/> 
 
                         <View style={{ alignItems:'center', paddingTop:this.state.paddingTopMain }}>
                             <ImageBackground source={require('../resources/images/fund_bg_small.png')} resizeMode={Image.resizeMode.contain} style={{height:100, width:330, justifyContent:'center',alignItems:'center', paddingLeft:10, paddingRight:10}} >
-                            <Text style={{color:'white', fontWeight: "bold", fontSize:12, textAlign:'center'}} selectable={true}>{this.state.walletAddress}</Text>
+                                <Text style={{color:'white', fontWeight: "bold", fontSize:12, textAlign:'center'}} selectable={true}>Q{this.state.walletAddress}</Text>
                                 <Text style={{color:'white',fontSize:30}}>{this.state.balance} QRL</Text>
                             </ImageBackground>
                             <TouchableOpacity style={styles.SubmitButtonStyle2} activeOpacity = { .5 } onPress={ this.refreshWallet }>
@@ -302,16 +302,16 @@ export default class SendReceive extends React.Component {
                     <KeyboardAvoidingView style={{flex:1}} keyboardVerticalOffset={-200} behavior="padding">
                         <ImageBackground source={require('../resources/images/sendreceive_bg_half.png')} style={styles.backgroundImage}>
                             <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                                <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='white'>
+                                <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                                 <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                                 </TouchableHighlight>
                             </View>
                             <FlashMessage/> 
 
                             <View style={{ alignItems:'center', paddingTop:20}}>
                                 <ImageBackground source={require('../resources/images/fund_bg_small.png')} resizeMode={Image.resizeMode.contain} style={{height:100, width:330, justifyContent:'center',alignItems:'center'}} >
-                                <Text style={{color:'white'}}>QRL BALANCE</Text>
-                                <Text style={{color:'white',fontSize:30}}>{this.state.balance}</Text>
+                                    <Text style={{color:'white', fontWeight: "bold", fontSize:12, textAlign:'center'}} selectable={true}>Q{this.state.walletAddress}</Text>
+                                    <Text style={{color:'white',fontSize:30}}>{this.state.balance} QRL</Text>
                                 </ImageBackground>
                                 <TouchableOpacity style={styles.SubmitButtonStyle2} activeOpacity = { .5 } onPress={ this.refreshWallet }>
                                     <Image source={require("../resources/images/refresh.png")} style={{height:40, width:40}}/>
@@ -398,8 +398,6 @@ const styles = StyleSheet.create({
         paddingTop:15,
         paddingBottom:15,
         backgroundColor:'#f33160',
-        borderWidth: 1,
-        borderColor: '#fff'
     },
     SubmitButtonStyleBig: {
         alignSelf:'center',

diff --git a/screens/TransactionsHistory.js b/screens/TransactionsHistory.js
@@ -45,6 +45,8 @@ export default class Wallet extends React.Component{
                 if (Platform.OS === 'ios'){
                     IosWallet.refreshWallet(walletindex, (error, walletAddress, otsIndex, balance, keys)=> {
                         this.setState({walletAddress: walletAddress, isLoading:false, updatedDate: new Date(), balance: balance, otsIndex: otsIndex, dataSource: ds.cloneWithRows(JSON.parse(keys)), tx_count: JSON.parse(keys).length})
+
+
                     });
                 }
                 // Android
@@ -166,7 +168,7 @@ export default class Wallet extends React.Component{
                 <ImageBackground source={require('../resources/images/main_bg_half.png')} style={styles.backgroundImage}>
                     <View style={{flex:1}}>
                         <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='white'>
+                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                                 <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                             </TouchableHighlight>
                         </View>
@@ -224,7 +226,7 @@ export default class Wallet extends React.Component{
                     <View style={{flex:1}}>
 
                         <View style={{alignItems:'flex-start', justifyContent:'flex-start', paddingTop:40, paddingLeft:30}}>
-                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='white'>
+                            <TouchableHighlight onPress={()=> this.props.navigation.openDrawer()} underlayColor='#184477'>
                                 <Image source={require('../resources/images/sandwich.png')} resizeMode={Image.resizeMode.contain} style={{height:25, width:25}} />
                             </TouchableHighlight>
                         </View>
@@ -239,7 +241,7 @@ export default class Wallet extends React.Component{
                                 <ImageBackground source={require('../resources/images/fund_bg.png')} resizeMode={Image.resizeMode.contain} style={{height:240, width:360, justifyContent:'center',alignItems:'center', paddingTop: 30, paddingLeft:10, paddingRight:10}} >
                                     {/* <Text style={{color:'white'}}>QRL BALANCE</Text> */}
                                     {/* <Text style={{color:'white', fontWeight: "bold"}} selectable={true}>Q{addressBegin}...{addressEnd}</Text> */}
-                                    <Text style={{color:'white', fontWeight: "bold", fontSize:12, textAlign:'center'}} selectable={true}>{this.state.walletAddress}</Text>
+                                    <Text style={{color:'white', fontWeight: "bold", fontSize:12, textAlign:'center'}} selectable={true}>Q{this.state.walletAddress}</Text>
                                     <Text style={{color:'white',fontSize:30}}>{this.state.balance / 1000000000 } QRL</Text>
                                     <Text style={{color:'white',fontSize:13}}>USD ${ ((this.state.balance / 1000000000 ) * this.state.price).toFixed(2) }</Text>
 
@@ -283,7 +285,7 @@ export default class Wallet extends React.Component{
                             <View style={{backgroundColor:'white', flex:2, width:350, alignSelf:'center', borderRadius:10, marginTop:10}}>
                                 <Text style={{alignItems:'center', alignSelf:'center', paddingTop:20, marginBottom:20}}>TRANSACTION HISTORY</Text>
                                     <View style={{height: .5,width: "90%",backgroundColor: "#000",alignSelf:'center'}}/>
-                                {this.state.tx_count == 0 ?
+                                {this.state.tx_count == 0 || this.state.tx_count == undefined ?
                                     <Text style={{alignSelf:'center'}}>No Transaction yet</Text>
                                     :
                                     <ListView automaticallyAdjustContentInsets={false} dataSource={this.state.dataSource} renderRow={this.renderRow.bind(this)} enableEmptySections={true} />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		��7_�8�Aw�s��&
		��/�eFC6�s_ֆ�SI��o