Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

view/Account.js

@@ -252,7 +252,7 @@ class Account extends React.Component {
         const navigation = this.props.navigation
         return (
             <View style={styles.container}>
-                <ScrollView>
+                <ScrollView style={{paddingTop: StatusBar.currentHeight}}>
 
                     <View style={{ flex: 1, height: 90 }}>
                         <View style={{ alignSelf: 'center' }}>

view/Home.js

@@ -657,7 +657,7 @@ class Home extends React.Component {
                   </TouchableOpacity>
                 </View>
                 <View style={{ justifyContent: 'center', flex: 1 }}>
-                  <TouchableOpacity onPress={() => this.onClickClaimCredit()}>
+                  <TouchableOpacity onPress={() => this.handleuseBalance()}>
                     <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', marginRight: 20, marginLeft: 20, justifyContent: 'center' }}>
                       <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('usebalance')}</Text>
                     </View>

view/OrderHistory.js

 import React from 'react';
-import { View, Text, TextInput, StyleSheet, ScrollView, Alert, TouchableOpacity, ActivityIndicator } from 'react-native';
+import { View, Text, TextInput, StyleSheet, ScrollView, Alert, TouchableOpacity, ActivityIndicator, StatusBar } from 'react-native';
 import { Card } from 'react-native-shadow-cards'
 import { connect } from 'react-redux';
 import Axios from 'axios';
@@ -85,6 +85,7 @@ class OrderHistory extends React.Component {
         // console.log(this.state.order_list)
         return (
             <View style={styles.container}>
+                <StatusBar backgroundColor='#CFB368' />
                 <View style={styles.header}>
                     <Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>{i18n.t('orderhistory')}</Text>
                 </View>
@@ -133,6 +134,7 @@ const styles = StyleSheet.create({
     },
     header: {
         flex: 0.1,
+        paddingTop: StatusBar.currentHeight,
         backgroundColor: '#ccb46c',
         justifyContent: 'center'
     },

view/RewardsList.js

 import React from 'react';
-import { View, Text, Image, StyleSheet, ScrollView, Alert, TouchableOpacity, ActivityIndicator } from 'react-native';
+import { View, Text, Image, StyleSheet, ScrollView, Alert, TouchableOpacity, ActivityIndicator, StatusBar } from 'react-native';
 import { Card } from 'react-native-shadow-cards'
 import { connect } from 'react-redux';
 import Axios from 'axios';
@@ -58,6 +58,7 @@ class RewardsList extends React.Component {
     render() {
         return (
             <View style={styles.container}>
+                <StatusBar backgroundColor='#CFB368' />
                 <View style={styles.header}>
                     <Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>{i18n.t('titlerewardhistory')}</Text>
                 </View>
@@ -112,7 +113,7 @@ const styles = StyleSheet.create({
     },
     header: {
         flex: 0.1,
-        marginBottom: 5,
+        paddingTop: StatusBar.currentHeight,
         backgroundColor: '#CFB368',
         justifyContent: 'center'
     },