nehanced notification items && fixed transfer title issues

src/components/notificationLine/view/notificationLineView.js

@@ -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';
+import { useIntl } from 'react-intl';
-// Constants
+import get from 'lodash/get';
 
 // Components
 import { UserAvatar } from '../../userAvatar';
@@ -9,64 +9,41 @@ import { UserAvatar } from '../../userAvatar';
 // Styles
 import styles from './notificationLineStyles';
 
-class NotificationLineView extends PureComponent {
+const NotificationLineView = ({ notification, handleOnPressNotification }) => {
-  /* Props
+  const [isRead, setIsRead] = useState(notification.read);
-   * ------------------------------------------------
+  const intl = useIntl();
-   *   @prop { type }    name                - Description....
+  let _title;
-   */
+  let titleExtra = '';
 
-  constructor(props) {
+  useEffect(() => {
-    super(props);
+    setIsRead(notification.read);
-    this.state = {
+  }, [notification]);
-      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 });
-    }
-  }
 
   // Component Functions
-  _handleOnNotificationPress = () => {
+  const _handleOnNotificationPress = () => {
-    const { handleOnPressNotification, notification } = this.props;
+    if (!isRead) {
-    const { isRead } = this.state;
+      setIsRead(true);
-
+    }
-    if (!isRead) this.setState({ isRead: true });
 
     handleOnPressNotification(notification);
   };
 
-  render() {
+  if (notification.type === 'transfer') {
-    const {
+    titleExtra = notification.amount;
-      notification,
+  } else if (notification.weight) {
-      intl: { formatMessage },
-    } = this.props;
-    const { isRead } = this.state;
-
-    let _title = formatMessage({
-      id: `notification.${notification.type}`,
-    });
-
-    if (notification.weight) {
     const _percent = `${parseFloat((notification.weight / 100).toFixed(2))}% `;
-      if (notification.weight < 0) {
+
-        _title = formatMessage({
+    titleExtra = _percent;
-          id: 'notification.unvote',
-        });
   }
 
-      _title = _percent + _title;
+  _title = `${titleExtra} ${intl.formatMessage({
-    }
+    id: `notification.${notification.type}`,
+  })}`;
 
   return (
-      <TouchableHighlight onPress={() => this._handleOnNotificationPress()}>
+    <TouchableHighlight onPress={_handleOnNotificationPress}>
       <View
-          key={Math.random()}
+        key={`${get(notification, 'id')}${_title}`}
         style={[styles.notificationWrapper, !isRead && styles.isNewNotification]}
       >
         <UserAvatar
@@ -84,7 +61,8 @@ class NotificationLineView extends PureComponent {
             </Text>
           )}
         </View>
-          {notification.image && (
+
+        {get(notification, 'image', null) && (
           <Image
             style={styles.image}
             source={{ uri: notification.image }}
@@ -94,7 +72,6 @@ class NotificationLineView extends PureComponent {
       </View>
     </TouchableHighlight>
   );
-  }
+};
-}
 
-export default injectIntl(NotificationLineView);
+export default NotificationLineView;

src/config/locales/as-IN.json

@@ -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",

src/config/locales/bg-BG.json

@@ -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",

src/config/locales/bn-BD.json

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

src/config/locales/bo-BT.json

@@ -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",

src/config/locales/bs-BA.json

@@ -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",

src/config/locales/ca-ES.json

@@ -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",

src/config/locales/ceb-PH.json

@@ -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",

src/config/locales/cs-CZ.json

@@ -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",

src/config/locales/da-DK.json

@@ -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",

src/config/locales/el-GR.json

@@ -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",

src/config/locales/en-US.json

@@ -19,8 +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",
     "epoint": "Points",

src/config/locales/eo-UY.json

@@ -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",

src/config/locales/es-ES.json

@@ -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",

src/config/locales/fi-FI.json

@@ -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",

src/config/locales/fil-PH.json

@@ -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",

src/config/locales/ga-IE.json

@@ -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",

src/config/locales/gl-ES.json

@@ -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",

src/config/locales/got-DE.json

@@ -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",

src/config/locales/hr-HR.json

@@ -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",

src/config/locales/hy-AM.json

@@ -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",

src/config/locales/is-IS.json

@@ -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",

src/config/locales/it-IT.json

@@ -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",

src/config/locales/ka-GE.json

@@ -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",

src/config/locales/kk-KZ.json

@@ -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",

src/config/locales/ks-IN.json

@@ -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",

src/config/locales/ku-TR.json

@@ -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",

src/config/locales/ky-KG.json

@@ -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",

src/config/locales/lv-LV.json

@@ -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",

src/config/locales/mk-MK.json

@@ -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",

src/config/locales/mn-MN.json

@@ -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",

src/config/locales/ne-NP.json

@@ -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",

src/config/locales/nl-NL.json

@@ -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",

src/config/locales/no-NO.json

@@ -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",

src/config/locales/pa-IN.json

@@ -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",

src/config/locales/pl-PL.json

@@ -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",

src/config/locales/sa-IN.json

@@ -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",

src/config/locales/sk-SK.json

@@ -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",

src/config/locales/sl-SI.json

@@ -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",

src/config/locales/sq-AL.json

@@ -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",

src/config/locales/sv-SE.json

@@ -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",

src/config/locales/sw-KE.json

@@ -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",

src/config/locales/ta-IN.json

@@ -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",

src/config/locales/tg-TJ.json

@@ -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",

src/config/locales/th-TH.json

@@ -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",

src/config/locales/tk-TM.json

@@ -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",

src/config/locales/uk-UA.json

@@ -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",

src/config/locales/ur-IN.json

@@ -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",

src/config/locales/ur-PK.json

@@ -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",

src/config/locales/uz-UZ.json

@@ -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",

src/config/locales/yo-NG.json

@@ -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",

src/config/locales/zh-CN.json

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

src/config/locales/zh-TW.json

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

src/screens/notification/container/notificationContainer.js

@@ -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 });