Merge remote-tracking branch 'origin/6.6.4' into 7.1.0

@@ -71,6 +71,7 @@ export default class Brand extends Component {
             if (this.state.showFooter) {
                 return <Image
                     style={styles.bottomImage}
+                    resizeMode= {'contain'}
                     source={require('../../images/brand/shared_bottom.png')}
                 />;
             }
@@ -141,6 +142,5 @@ let styles = StyleSheet.create({
         width,
         marginTop: 15,
         marginBottom: 15,
-        resizeMode: 'center',
     },
 });

@@ -132,7 +132,7 @@ export default class BrandCell extends Component{
             <View style={styles.container}>
                 <View style={styles.topContainer}>
                     <View style={styles.left}>
-                        <YH_Image style={styles.icon} url={icon} />
+                        <Image style={styles.icon} resizeMode= {'contain'} source={{uri: icon}} />
                         <View>
                             <Text style={styles.name} numberOfLines={1}>{data.get('brand_name')}</Text>
                             {this.renderDesc()}
@@ -141,17 +141,15 @@ export default class BrandCell extends Component{
                     <View style={styles.right}>
                         <TouchableOpacity
                             activeOpacity={1}
-                            style={styles.optTouch}
                             onPress={this.props.onPressLike}
                         >
-                            <View><Image style={styles.optIcon} source={heartIcon} /></View>
+                            <View style={styles.optTouch}><Image style={styles.optIcon} resizeMode= {'contain'} source={heartIcon} /></View>
                         </TouchableOpacity>
                         <TouchableOpacity
                             activeOpacity={1}
-                            style={styles.optTouch}
                             onPress={this.props.onPressHome}
                         >
-                            <Image style={styles.optIcon} source={homeIcon} />
+                            <View style={styles.optTouch}><Image style={styles.optIcon} resizeMode= {'contain'} source={homeIcon} /></View>
                         </TouchableOpacity>
                     </View>
                 </View>
@@ -203,7 +201,6 @@ let styles = StyleSheet.create({
         marginLeft: 10,
         width: 50,
         height: 50,
-        resizeMode: 'contain',
     },
     name: {
         marginTop: 10,
@@ -230,11 +227,12 @@ let styles = StyleSheet.create({
     optTouch: {
         width: 44,
         height: 44,
+        alignItems: 'center',
+        justifyContent: 'center',
     },
     optIcon: {
-        width: 38,
-        height: 38,
-        resizeMode: 'center',
+        width: 17,
+        height: 17,
     },
     rowContainer: {
         width: 113,