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

# Conflicts:
#	view/Home.js

view/Home.js

@@ -41,7 +41,7 @@ class Home extends React.Component {
   componentDidMount() {
     // const { navigation } = this.props
     // CheckVersion(navigation)
-   
+
     const screenWidth = Math.round(Dimensions.get('window').width);
     this.setState({
       slider_height: screenWidth
@@ -66,7 +66,7 @@ class Home extends React.Component {
       this._account();
       if (this.props.outlet_id == '' && this.props.name_outlet == '' && this.props.outlet_detailadress == '') {
         this._getPermissions()
-        
+
       } else {
         this.setState({
           indicator: false,
@@ -316,8 +316,8 @@ class Home extends React.Component {
                   {i18n.t('orderInfo')}
                 </Text> */}
                     <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color: '#838383' }}>
-                    {i18n.t('orderInfo')}
-                </Text>
+                      {i18n.t('orderInfo')}
+                    </Text>
                     {this.state.indicator == true ? (
                       <ActivityIndicator size="small" color="#c9af6d" />
                     ) : (
@@ -385,20 +385,17 @@ class Home extends React.Component {
                 ) :
                   this.state.account_number === "" ? (
                     <View style={styles.card}>
-                      <Card style={{ padding: 10, margin: 10, alignContent: 'center' }}>
-                        <Text style={{ textAlign: "center", fontFamily: 'Gotham-Light' }}> {i18n.t('NotActivate')}</Text>
-                        <Text>
-                        </Text>
-                        <Text style={{ textAlign: "center", fontSize: 40, color: '#c9af6d' }}>
-
-                        </Text>
-                        <View style={styles.line}></View>
-                        <Text style={{ textAlign: 'left', fontWeight: 'bold' }}> {'\n'}
+                      <Card style={{ padding: 10, margin: 10, alignContent: 'center', backgroundColor: '#838383' }}>
+                        <View style={{ flex: 1, backgroundColor: 'grey', height: 150, borderRadius: 20, marginRight: 10, marginLeft: 10, justifyContent: 'center' }}>
+                          <View style={{ justifyContent: 'center' }}>
+                            <TouchableOpacity onPress={() => this.props.navigation.navigate('Card Activation')}>
+                              <View style={{ height: 50, borderRadius: 20, backgroundColor: 'white', marginRight: 20, marginLeft: 20, }}>
+                                <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 15 }}> {i18n.t('Acitvatecard')}</Text>
+                              </View>
+                            </TouchableOpacity>
+                          </View>
 
-                        </Text>
-                        <View style={styles.line}></View>
-                        <Text style={{ textAlign: 'left', fontWeight: 'bold' }}>{'\n'}
-                        </Text>
+                        </View>
                       </Card>
                     </View>
                   ) :
@@ -672,7 +669,7 @@ const mapStateToProps = (state) => {
 
     // login
     in_payment: state.in_payment,
-    BASE_URL : state.BASE_URL,
+    BASE_URL: state.BASE_URL,
     email: state.email,
     outlet_id: state.outlet_id,
     name_outlet: state.name_outlet,