Merge pull request #1076 from esteemapp/general/fix

created poins memo description
This commit is contained in:
Mustafa Buyukcelebi 2019-08-26 01:11:38 +03:00 committed by GitHub
commit 44c911740c
3 changed files with 32 additions and 13 deletions

View File

@ -1,3 +1,4 @@
/* eslint-disable react/jsx-wrap-multilines */
import React, { Component, Fragment } from 'react';
import { Text, View, FlatList, ScrollView, RefreshControl, TouchableOpacity } from 'react-native';
import { injectIntl } from 'react-intl';
@ -11,6 +12,7 @@ import { IconButton } from '../../iconButton';
import { Icon } from '../../icon';
import { MainButton } from '../../mainButton';
import { DropdownButton } from '../../dropdownButton';
import { CollapsibleCard } from '../../collapsibleCard';
// Utils
import { getTimeFromNow } from '../../../utils/time';
@ -198,17 +200,33 @@ class PointsView extends Component {
keyExtractor={item => item.id.toString()}
ListEmptyComponent={this._renderLoading()}
renderItem={({ item, index }) => (
<WalletLineItem
index={index + 1}
text={this._getTranslation(get(item, 'textKey'))}
description={getTimeFromNow(get(item, 'created'))}
isCircleIcon
isThin
isBlackText
iconName={get(item, 'icon')}
iconType={get(item, 'iconType')}
rightText={`${get(item, 'amount')} ESTM`}
/>
<CollapsibleCard
noBorder
noContainer
key={item.id.toString()}
titleComponent={
<WalletLineItem
index={index + 1}
text={this._getTranslation(get(item, 'textKey'))}
description={getTimeFromNow(get(item, 'created'))}
isCircleIcon
isThin
isBlackText
iconName={get(item, 'icon')}
iconType={get(item, 'iconType')}
rightText={`${get(item, 'amount')} ESTM`}
/>
}
>
{(get(item, 'memo') || get(item, 'sender')) && (
<WalletLineItem
isBlackText
isThin
text={`${intl.formatMessage({ id: 'points.from' })} ${get(item, 'sender')}`}
description={get(item, 'memo')}
/>
)}
</CollapsibleCard>
)}
/>
</View>

View File

@ -85,7 +85,7 @@ class TransactionView extends PureComponent {
{(get(transactionData, 'details') || get(transactionData, 'memo')) && (
<WalletLineItem
key={index.toString()}
text={get(transactionData, 'details', 'pipi')}
text={get(transactionData, 'details', '')}
isBlackText
isThin
description={get(transactionData, 'memo')}

View File

@ -69,7 +69,8 @@
"checkin_extra_desc": "Consistent use of app gives you extra chances to earn more 10 points, be more active and earn more.",
"dropdown_transfer": "Gift",
"dropdown_promote": "Promote",
"dropdown_boost": "Boost"
"dropdown_boost": "Boost",
"from": "From"
},
"messages": {
"comingsoon": "Messages feature is coming soon!"