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

view/Home.js

@@ -220,7 +220,7 @@ class Home extends React.Component {
                 </TouchableOpacity>
               </View>
             </View>
-            <View style={{flex:2}}>
+            <View style={{ flex: 2 }}>
               {
                 this.state.images.length ? (
                   <SliderBox
@@ -258,10 +258,10 @@ class Home extends React.Component {
                     onCurrentImagePressed={(index) => this.props.navigation.navigate('News Detail', { slug: this.state.slugs[index] })}
                   />
                 ) : (
-                  <View style={{height : this.state.slider_height, backgroundColor: '#838383',justifyContent:'center'}}>
-                    <ActivityIndicator size="large" color="#c9af6d" />
-                  </View>
-                )
+                    <View style={{ height: this.state.slider_height, backgroundColor: '#838383', justifyContent: 'center' }}>
+                      <ActivityIndicator size="large" color="#c9af6d" />
+                    </View>
+                  )
               }
             </View>
           </View>
@@ -385,14 +385,35 @@ class Home extends React.Component {
                 <TouchableOpacity
                   // style={styles.submitUpgradePemium} 
                   activeOpacity={.5} onPress={() => this.props.navigation.navigate('TopUpInfo')}>
-                  <View style={styles.topUseBalance}>
+                  <View style={{
+                    flex: 0.5,
+                    height: 40,
+                    top: 20,
+                    margin: 5,
+                    marginLeft: -10,
+                    paddingVertical: 12,
+                    paddingRight: 10,
+                    paddingLeft: 14,
+                    borderRadius: 10,
+                    backgroundColor: '#CFB368',
+                  }}>
                     <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>TOP UP BALANCE </Text>
                   </View>
                 </TouchableOpacity>
                 <TouchableOpacity
                   // style={styles.submitUpgradePemium} 
                   activeOpacity={.5} onPress={() => this._useBalance()}>
-                  <View style={styles.topUseBalance}>
+                  <View style={{
+                    flex: 0.5,
+                    height: 40,
+                    top: 20,
+                    margin: 5,
+                    marginRight: -10,
+                    paddingVertical: 12,
+                    paddingHorizontal: 24,
+                    borderRadius: 10,
+                    backgroundColor: '#CFB368',
+                  }}>
                     <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>USE BALANCE </Text>
                   </View>
                 </TouchableOpacity>
@@ -481,7 +502,7 @@ const styles = StyleSheet.create({
     height: 40,
     top: 20,
     margin: 5,
-    paddingVertical : 12,
+    paddingVertical: 12,
     paddingHorizontal: 16,
     borderRadius: 10,
     backgroundColor: '#CFB368',