Merge pull request #499 from Bit-Nation/hotfix/1.2.1

Hotfix/1.2.1

android/app/build.gradle

@@ -103,8 +103,8 @@ android {
         applicationId 'co.bitnation'
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 15
-        versionName "1.2.0"
+        versionCode 16
+        versionName "1.2.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

ios/Pangea/Info.plist

@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Pangea",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

src/global/translations/en.json

@@ -322,6 +322,7 @@
       "newChat": "New Chat",
       "invalidKey": "Invalid or Missing Key",
       "inviteSent": "Invite Sent",
+      "dAppMessagePreview": "DApp message...",
       "menu": {
         "filterChatList": "Filter Chat List",
         "markAllRead": "Mark all as read",

src/screens/PrivateChat/ChatList/index.js

@@ -22,7 +22,7 @@ import Loading from '../../../components/common/Loading';
 import NavigatorComponent from '../../../components/common/NavigatorComponent';
 import i18n from '../../../global/i18n';
 import Colors from '../../../global/colors';
-import type { ProfileType, ChatSessionType } from '../../../types/Chat';
+import type { ProfileType, ChatSessionType, GiftedChatMessageType } from '../../../types/Chat';
 import type { Navigator } from '../../../types/ReactNativeNavigation';
 import ScreenTitle from '../../../components/common/ScreenTitle';
 import NewChatModal from './NewChatModal';
@@ -261,9 +261,16 @@ class ChatListScreen extends NavigatorComponent<Props, State> {
           renderItem={(item) => {
             const session: ChatSessionType = item.item;
             const iconSource = imageSource(session.profile.image) || AssetsImages.avatarIcon;
+            const messagePreview = ((message: GiftedChatMessageType | null) => {
+              if (message == null) return null;
+              if (message.dAppMessage == null) return message.text;
+
+              // @todo Add preview for DApp messages.
+              return i18n.t('screens.chat.dAppMessagePreview');
+            })(session.messages.length === 0 ? null : session.messages[session.messages.length - 1]);
             return (<ChatListItem
               name={session.profile.name}
-              lastMessage={session.messages.length === 0 ? null : session.messages[session.messages.length - 1].text}
+              lastMessage={messagePreview}
               avatar={iconSource}
               onPress={this.onChatSelect}
               unreadMessages={session.unreadMessages}

src/types/DApp.js

@@ -6,16 +6,16 @@ export type DApp = {
 }
 
 export type PanthalassaDApp = {
-  name: { [string]: string },
-  code: string,
-  used_signing_key: string,
-  signature: string,
-  engine: {
+  Name: { [string]: string },
+  Code: string,
+  UsedSigningKey: string,
+  Signature: string,
+  Engine: {
     major: number,
     minor: number,
     patch: number,
   },
-  version: number,
+  Version: number,
 }
 
 export type DAppModalInfo = {

src/utils/chat.js

@@ -49,10 +49,10 @@ export function createGiftedChatMessageObjects(sender: Account, receiver: Profil
       try {
         const dAppMessageJSON = JSON.parse(data.dapp);
         dAppMessage = {
-          dAppPublicKey: Buffer.from(dAppMessageJSON.dapp_public_key, 'base64').toString('hex'),
-          params: dAppMessageJSON.params,
-          shouldSend: dAppMessageJSON.should_send,
-          type: dAppMessageJSON.type,
+          dAppPublicKey: Buffer.from(dAppMessageJSON.DAppPublicKey, 'base64').toString('hex'),
+          params: dAppMessageJSON.Params,
+          shouldSend: dAppMessageJSON.ShouldSend,
+          type: dAppMessageJSON.Type,
         };
       } catch (error) {
         console.log(`[CHAT] Unable to parse DApp message: ${data.dapp}`);

src/utils/mapping/dapp.js

@@ -10,9 +10,9 @@ import type { DApp, PanthalassaDApp } from '../../types/DApp';
  * @return {Object} Converted DApp object.
  */
 export function convertFromPanthalassa(dApp: PanthalassaDApp, locale: string = 'en-us'): DApp {
-  const hexPublicKey = Buffer.from(dApp.used_signing_key, 'base64').toString('hex');
+  const hexPublicKey = Buffer.from(dApp.UsedSigningKey, 'base64').toString('hex');
   return {
-    name: dApp.name[locale] || dApp.name['en-us'],
+    name: dApp.Name[locale] || dApp.Name['en-us'],
     publicKey: hexPublicKey,
   };
 }