ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-20 11:51:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

nehanced notification items && fixed transfer title issues

Browse Source
This commit is contained in:
ue 2019-10-20 18:08:40 +03:00
parent 06ca41c965
commit 08d61c28c5
54 changed files with 111 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/components/notificationLine/view/notificationLineView.js
View File

@ -1,7 +1,7 @@
import React, { PureComponent } from 'react';
import React, { useState, useEffect } from 'react';
import { View, Text, Image, TouchableHighlight } from 'react-native';
import { injectIntl } from 'react-intl';
// Constants
import { useIntl } from 'react-intl';
import get from 'lodash/get';
// Components
import { UserAvatar } from '../../userAvatar';
@ -9,92 +9,69 @@ import { UserAvatar } from '../../userAvatar';
// Styles
import styles from './notificationLineStyles';
class NotificationLineView extends PureComponent {
/* Props
* ------------------------------------------------
* @prop { type } name - Description....
*/
const NotificationLineView = ({ notification, handleOnPressNotification }) => {
const [isRead, setIsRead] = useState(notification.read);
const intl = useIntl();
let _title;
let titleExtra = '';
constructor(props) {
super(props);
this.state = {
isRead: props.notification.read,
};
}
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { notification } = this.props;
if (notification.read !== nextProps.notification.read) {
this.setState({ isRead: nextProps.notification.read });
}
}
useEffect(() => {
setIsRead(notification.read);
}, [notification]);
// Component Functions
_handleOnNotificationPress = () => {
const { handleOnPressNotification, notification } = this.props;
const { isRead } = this.state;
if (!isRead) this.setState({ isRead: true });
const _handleOnNotificationPress = () => {
if (!isRead) {
setIsRead(true);
}
handleOnPressNotification(notification);
};
render() {
const {
notification,
intl: { formatMessage },
} = this.props;
const { isRead } = this.state;
if (notification.type === 'transfer') {
titleExtra = notification.amount;
} else if (notification.weight) {
const _percent = `${parseFloat((notification.weight / 100).toFixed(2))}% `;
let _title = formatMessage({
id: `notification.${notification.type}`,
});
titleExtra = _percent;
}
if (notification.weight) {
const _percent = `${parseFloat((notification.weight / 100).toFixed(2))}% `;
if (notification.weight < 0) {
_title = formatMessage({
id: 'notification.unvote',
});
}
_title = `${titleExtra} ${intl.formatMessage({
id: `notification.${notification.type}`,
})}`;
_title = _percent + _title;
}
return (
<TouchableHighlight onPress={() => this._handleOnNotificationPress()}>
<View
key={Math.random()}
style={[styles.notificationWrapper, !isRead && styles.isNewNotification]}
>
<UserAvatar
username={notification.source}
style={[styles.avatar, !notification.avatar && styles.hasNoAvatar]}
/>
<View style={styles.body}>
<View style={styles.titleWrapper}>
<Text style={styles.name}>{notification.source} </Text>
<Text style={styles.title}>{_title}</Text>
</View>
{notification.description && (
<Text numberOfLines={1} style={styles.description}>
{notification.description}
</Text>
)}
return (
<TouchableHighlight onPress={_handleOnNotificationPress}>
<View
key={`${get(notification, 'id')}${_title}`}
style={[styles.notificationWrapper, !isRead && styles.isNewNotification]}
>
<UserAvatar
username={notification.source}
style={[styles.avatar, !notification.avatar && styles.hasNoAvatar]}
/>
<View style={styles.body}>
<View style={styles.titleWrapper}>
<Text style={styles.name}>{notification.source} </Text>
<Text style={styles.title}>{_title}</Text>
</View>
{notification.image && (
<Image
style={styles.image}
source={{ uri: notification.image }}
defaultSource={require('../../../assets/no_image.png')}
/>
{notification.description && (
<Text numberOfLines={1} style={styles.description}>
{notification.description}
</Text>
)}
</View>
</TouchableHighlight>
);
}
}
export default injectIntl(NotificationLineView);
{get(notification, 'image', null) && (
<Image
style={styles.image}
source={{ uri: notification.image }}
defaultSource={require('../../../assets/no_image.png')}
/>
)}
</View>
</TouchableHighlight>
);
};
export default NotificationLineView;

2
src/config/locales/as-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/bg-BG.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/bn-BD.json
View File

@ -19,7 +19,7 @@
"unfollow": "আপনাকে অননুসরণ করেছে",
"ignore": "আপনাকে উপেক্ষা করেছে",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/bo-BT.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/bs-BA.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ca-ES.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ceb-PH.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/cs-CZ.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/da-DK.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/el-GR.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

3
src/config/locales/en-US.json
View File

@ -19,8 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"comingsoon": "Feature is coming soon!",
"transfer": "transferred",
"notification": "Notifications",
"leaderboard": "Leaderboard",
"epoint": "Points",

2
src/config/locales/eo-UY.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/es-ES.json
View File

@ -19,7 +19,7 @@
"unfollow": "dejó de seguirte",
"ignore": "te ignoró",
"reblog": "reblogueó tu publicación",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notificaciones",
"leaderboard": "Tabla de posiciones",

2
src/config/locales/fi-FI.json
View File

@ -19,7 +19,7 @@
"unfollow": "lopetti seuraamisesi",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/fil-PH.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ga-IE.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/gl-ES.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/got-DE.json
View File

@ -19,7 +19,7 @@
"unfollow": "unlaistida þuk",
"ignore": "ignored you",
"reblog": "aftrablaugida þein waurd",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/hr-HR.json
View File

@ -19,7 +19,7 @@
"unfollow": "te prestao/la pratiti",
"ignore": "te ignorira",
"reblog": "je podijelio tvoju objavu",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Obavijesti",
"leaderboard": "Rang lista",

2
src/config/locales/hy-AM.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/is-IS.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/it-IT.json
View File

@ -19,7 +19,7 @@
"unfollow": "non ti segue più",
"ignore": "ti ha ignorato",
"reblog": "ha ripostato il tuo post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifiche",
"leaderboard": "Classifica",

2
src/config/locales/ka-GE.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/kk-KZ.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ks-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ku-TR.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ky-KG.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/lv-LV.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/mk-MK.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/mn-MN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ne-NP.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/nl-NL.json
View File

@ -19,7 +19,7 @@
"unfollow": "ontvolgt je",
"ignore": "heeft je genegeerd",
"reblog": "deelde je bericht",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notificaties",
"leaderboard": "Scorebord",

2
src/config/locales/no-NO.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/pa-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/pl-PL.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sa-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sk-SK.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sl-SI.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sq-AL.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sv-SE.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/sw-KE.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ta-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/tg-TJ.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/th-TH.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/tk-TM.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/uk-UA.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ur-IN.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/ur-PK.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/uz-UZ.json
View File

@ -19,7 +19,7 @@
"unfollow": "unfollowed you",
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",

2
src/config/locales/yo-NG.json
View File

@ -19,7 +19,7 @@
"unfollow": "ko ba o lo mo",
"ignore": "ti ko eti ikun",
"reblog": "ti se eda oro re",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "Awon Akiyesi",
"leaderboard": "Ate asiwaju",

2
src/config/locales/zh-CN.json
View File

@ -19,7 +19,7 @@
"unfollow": "取消关注了您",
"ignore": "忽视了您",
"reblog": "转发了您的帖子",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "通知",
"leaderboard": "排行榜",

2
src/config/locales/zh-TW.json
View File

@ -19,7 +19,7 @@
"unfollow": "取消關注了您",
"ignore": "忽略了您",
"reblog": "轉發了您的帖子",
"transfer": "transfered steem",
"transfer": "transferred",
"comingsoon": "Feature is coming soon!",
"notification": "通知",
"leaderboard": "排行榜",

6
src/screens/notification/container/notificationContainer.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Alert } from 'react-native';
import { connect } from 'react-redux';
import { get, some, isEmpty } from 'lodash';
import get from 'lodash/get';
import { injectIntl } from 'react-intl';
// Actions and Services
@ -118,7 +118,9 @@ class NotificationContainer extends Component {
const { username, dispatch, intl, isConnected } = this.props;
const { notifications } = this.state;
if (!isConnected) return;
if (!isConnected) {
return;
}
this.setState({ isNotificationRefreshing: true });