Skip to content

I
InvestCustomer
Commit ee6cd993 by Giang Tran
Options

update ui transaction

parent 510ae0bc
Showing with 85 additions and 61 deletions
src/Screens/Notification/Item.js
......@@ -13,7 +13,6 @@ import Block from '../../components/Block';
const Item = (props) => {
const {item} = props;
console.log('noti', item);
return (
<View style={styles.container}>
<Block flex={1} row>
......@@ -35,7 +34,7 @@ export default Item;
const styles = StyleSheet.create({
container: {
marginTop: 10,
marginTop: 8,
paddingVertical: 10,
shadowColor: '#000',
shadowOffset: {
......@@ -47,7 +46,7 @@ const styles = StyleSheet.create({
elevation: 5,
marginHorizontal: 10,
backgroundColor: R.colors.white,
marginBottom: 10,
marginBottom: 2,
borderRadius: HEIGHTXD(30),
},
......
src/Screens/Transaction/DueDate/Item.js
......@@ -19,27 +19,37 @@ import I18n from '../../../helper/i18/i18n';
const Item = (props) => {
const {item, isEndItem} = props;
console.log(item)
console.log(item);
return (
<View style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<View
style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<View style={styles.wrapDate}>
<Image source={{uri: item.commoditiy.image_path}} style={styles.imgIcon} />
<Image
source={{uri: item.commoditiy.image_path}}
style={styles.imgIcon}
/>
</View>
<Block padding={[5, 10]} space={'between'} flex={1}>
<Block padding={[0, 10]} space={'between'} flex={1}>
<View
style={{
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
}}>
<Text numberOfLines={2} style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]} numberOfLines={1} ellipsizeMode='tail'>
<Text
numberOfLines={2}
style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]}
numberOfLines={1}
ellipsizeMode="tail">
{item.contract_name}
</Text>
<Text style={styles.txtMoney}>{item.term}</Text>
</View>
<Text style={styles.txtCode}>{`${I18n.t('ContactCode')}: ${item.contract_code}`}</Text>
<Text style={styles.txtCode}>{`${I18n.t('ContactCode')}: ${
item.contract_code
}`}</Text>
<Text style={styles.txt}>{item.open_interest_range}</Text>
</Block>
</Block>
......@@ -64,7 +74,7 @@ const styles = StyleSheet.create({
marginHorizontal: 10,
backgroundColor: R.colors.white,
borderRadius: HEIGHTXD(30),
marginVertical: HEIGHTXD(15)
marginVertical: HEIGHTXD(15),
},
wrapLeft: {
......@@ -95,12 +105,12 @@ const styles = StyleSheet.create({
alignItems: 'center',
},
txtBlack: {
fontSize: getFontXD(50),
fontSize: getFontXD(46),
color: 'black',
},
imgIcon: {
width: WIDTHXD(150),
height: WIDTHXD(150),
width: WIDTHXD(178),
height: WIDTHXD(178),
resizeMode: 'cover',
},
txtMoney: {
......
src/Screens/Transaction/Escrow/Item.js
......@@ -15,29 +15,40 @@ import {
} from '../../../Config/Functions';
import R from '../../../assets/R';
import Block from '../../../components/Block';
import I18n from '../../../helper/i18/i18n';
const Item = (props) => {
const {item, isEndItem} = props;
return (
<View style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<View
style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<View style={styles.wrapDate}>
<Image source={{uri: item.image_path}} style={styles.imgIcon} />
</View>
<Block padding={[5, 10]} space={'between'} flex={1}>
<Block padding={[0, 10]} flex={1}>
<View
style={{
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 5,
}}>
<Text numberOfLines={2} style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]} numberOfLines={1} ellipsizeMode='tail'>
<Text
numberOfLines={2}
style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]}
numberOfLines={1}
ellipsizeMode="tail">
{item.name}
</Text>
<Text style={styles.txtMoney}>{item.escrow > 0 ? toPriceVnd(item.escrow) : 0}</Text>
<Text style={styles.txtMoney}>
{item.escrow > 0 ? toPriceVnd(item.escrow) : 0}
</Text>
</View>
<Text style={styles.txt}>{item.code}</Text>
<Text style={styles.txt}>
{' '}
{I18n.t('code')}: {item.code}
</Text>
</Block>
</Block>
</TouchableOpacity>
......@@ -61,7 +72,7 @@ const styles = StyleSheet.create({
marginHorizontal: 10,
backgroundColor: R.colors.white,
borderRadius: HEIGHTXD(30),
marginVertical: HEIGHTXD(15)
marginVertical: HEIGHTXD(15),
},
wrapLeft: {
......@@ -87,7 +98,7 @@ const styles = StyleSheet.create({
alignItems: 'center',
},
txtBlack: {
fontSize: getFontXD(50),
fontSize: getFontXD(46),
color: 'black',
},
imgIcon: {
......
src/Screens/Transaction/PriceList/Item.js
......@@ -15,27 +15,35 @@ import {
} from '../../../Config/Functions';
import R from '../../../assets/R';
import Block from '../../../components/Block';
import I18n from '../../../helper/i18/i18n';
const Item = (props) => {
const {item, isEndItem} = props;
console.log('sss', item);
return (
<View style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<View
style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<Image source={{uri: item.image_path}} style={styles.imgIcon} />
<Block padding={[0, WIDTHXD(40)]} space={'between'} flex={1}>
<View
style={{
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
}}>
<Text numberOfLines={2} style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]} numberOfLines={1} ellipsizeMode='tail'>
<Text
numberOfLines={2}
style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]}
numberOfLines={1}
ellipsizeMode="tail">
{item.name}
</Text>
<Text style={styles.txtMoney}>{toPriceVnd(item.fee)}</Text>
</View>
<Text style={styles.txt}>{item.code}</Text>
<Text style={styles.txt}>
{I18n.t('code')}: {item.code}
</Text>
<Text style={styles.txt}>{item.category.name}</Text>
</Block>
</Block>
</TouchableOpacity>
......@@ -59,7 +67,7 @@ const styles = StyleSheet.create({
backgroundColor: R.colors.white,
borderRadius: HEIGHTXD(30),
marginVertical: HEIGHTXD(15),
marginHorizontal: WIDTHXD(30)
marginHorizontal: WIDTHXD(30),
},
wrapLeft: {
......@@ -82,14 +90,14 @@ const styles = StyleSheet.create({
alignItems: 'center',
},
txtBlack: {
fontSize: getFontXD(50),
fontSize: getFontXD(46),
color: 'black',
},
imgIcon: {
width: WIDTHXD(150),
height: WIDTHXD(150),
width: WIDTHXD(178),
height: WIDTHXD(178),
resizeMode: 'cover',
marginLeft: WIDTHXD(35)
marginLeft: WIDTHXD(35),
},
txtMoney: {
fontSize: getFontXD(42),
......
src/Screens/Transaction/TimeTransaction/Item.js
import React from 'react';
import {
View,
Text,
StyleSheet,
TouchableOpacity,
Image,
} from 'react-native';
import {
getFontXD,
HEIGHTXD,
WIDTHXD,
} from '../../../Config/Functions';
import {View, Text, StyleSheet, TouchableOpacity, Image} from 'react-native';
import {getFontXD, HEIGHTXD, WIDTHXD} from '../../../Config/Functions';
import R from '../../../assets/R';
import Block from '../../../components/Block';
const Item = (props) => {
const {item, isEndItem} = props;
return (
<View style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<View
style={[styles.container, isEndItem && {marginBottom: HEIGHTXD(100)}]}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<View style={styles.wrapDate}>
<Image source={{uri: item.image_path}} style={styles.imgIcon}/>
<Image source={{uri: item.image_path}} style={styles.imgIcon} />
</View>
<Block padding={[0, 10]} space={'between'} flex={1}>
<Block padding={[0, 10]} flex={1}>
<View
style={{
flex: 1,
flexDirection: 'row',
justifyContent: 'space-between',
}}>
<Text numberOfLines={2} style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]}
numberOfLines={1} ellipsizeMode='tail'>
<Text
numberOfLines={2}
style={[styles.txtBlack, {flexWrap: 'wrap', flex: 1}]}
numberOfLines={1}
ellipsizeMode="tail">
{item.name}
</Text>
<Text style={styles.txtMoney}>{item.trans_time}</Text>
</View>
{item.trans_session_list.map((sessionItem) => (
<Text style={[styles.txt, {marginTop: HEIGHTXD(20)}]}>{sessionItem}</Text>
)
)}
<Text style={[styles.txt, {marginTop: HEIGHTXD(20)}]}>
{sessionItem}
</Text>
))}
</Block>
</Block>
</TouchableOpacity>
......@@ -88,12 +81,12 @@ const styles = StyleSheet.create({
alignItems: 'center',
},
txtBlack: {
fontSize: getFontXD(50),
fontSize: getFontXD(46),
color: 'black',
},
imgIcon: {
width: WIDTHXD(150),
height: WIDTHXD(150),
width: WIDTHXD(178),
height: WIDTHXD(178),
resizeMode: 'cover',
},
txtMoney: {
......
src/helper/i18/locales/en.js
......@@ -193,7 +193,7 @@ export default {
NothingChange: 'Nothing change',
Tradding: 'Tradding',
ContractDescription: 'Contract description',
QualityStandard: 'Quality Standard',
QualityStandard: 'Standard',
CommodityTransactions: 'Commodity transactions',
CommodityCode: 'Commodity code',
Escrow: 'Escrow',
......@@ -272,8 +272,10 @@ export default {
ProfitLoss: 'Profit/Loss',
BUY_IN: 'Buy in',
SELL_OUT: 'Sell out',
YouCanNotTransaction: 'You can not trade the above contracts with the current available escrow',
YouCanTransaction: 'You can trade the above contracts with the current available escrow',
YouCanNotTransaction:
'You can not trade the above contracts with the current available escrow',
YouCanTransaction:
'You can trade the above contracts with the current available escrow',
EnterContractInfo: 'Enter contract information',
EnterFirstEscrow: 'Enter first escrow',
......@@ -282,5 +284,5 @@ export default {
Count: 'Count',
Systemmaintenance: 'The system is maintenance',
WaitUpdateCQG: 'Waiting Update CQG',
code: 'Code',
};
src/helper/i18/locales/vn.js
......@@ -196,7 +196,7 @@ export default {
NothingChange: 'Không có gì thay đổi',
Tradding: 'Giao dịch',
ContractDescription: 'Đặc tả hợp đồng',
QualityStandard: 'TIêu chuẩn chất lượng',
QualityStandard: 'TIêu chuẩn',
CommodityTransactions: 'Hàng hóa giao dịch',
CommodityCode: 'Mã hàng hóa',
Escrow: 'Ký quỹ',
......@@ -282,4 +282,5 @@ export default {
WaitUpdateCQG: 'Chờ cập nhật CQG',
FirstPriceRange: 'Giới hạn giá ban đầu',
ExpandPriceRange: 'Giới hạn giá mở rộng',
code: 'Mã',
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment