From 98f20aa7c67db7dbede0c231ad8255fceb4a58ce Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Sat, 27 Feb 2021 13:36:46 +0500
Subject: [PATCH] show incoming and current note in merge editor

---
 apps/mobile/src/components/MergeEditor/index.js | 8 +++++++-
 apps/mobile/src/components/NoteItem/wrapper.js  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/src/components/MergeEditor/index.js b/apps/mobile/src/components/MergeEditor/index.js
index 04f43a410..0560b1f95 100644
--- a/apps/mobile/src/components/MergeEditor/index.js
+++ b/apps/mobile/src/components/MergeEditor/index.js
@@ -1,5 +1,5 @@
 import React, {createRef, useEffect, useState} from 'react';
-import {Modal, SafeAreaView, TouchableOpacity, View} from 'react-native';
+import {Modal, SafeAreaView, TouchableOpacity, View, Text} from 'react-native';
 import Animated, {Easing} from 'react-native-reanimated';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
@@ -432,6 +432,9 @@ const MergeEditor = () => {
                   style={{maxWidth: '80%'}}
                   color={colors.icon}
                   size={SIZE.xs}>
+                  <Text style={{color: colors.accent, fontWeight: 'bold'}}>
+                    (This Device)
+                  </Text>{' '}
                   Saved on {timeConverter(primaryData.dateEdited)}
                 </Paragraph>
                 <Icon
@@ -576,6 +579,9 @@ const MergeEditor = () => {
                   style={{maxWidth: '80%'}}
                   color={colors.icon}
                   size={SIZE.xs}>
+                  <Text style={{color: 'red', fontWeight: 'bold'}}>
+                    (Incoming)
+                  </Text>{' '}
                   Saved on {timeConverter(secondaryData.dateEdited)}
                 </Paragraph>
                 <Icon
diff --git a/apps/mobile/src/components/NoteItem/wrapper.js b/apps/mobile/src/components/NoteItem/wrapper.js
index e80e0b8a1..b79b65e8b 100644
--- a/apps/mobile/src/components/NoteItem/wrapper.js
+++ b/apps/mobile/src/components/NoteItem/wrapper.js
@@ -53,7 +53,7 @@ export const NoteWrapper = ({item, index, isTrash = false}) => {
 
  
   const onPress = async () => {
-    if (note.conflicted) {
+    if (!note.conflicted) {
       eSendEvent(eShowMergeDialog, note);
       return;
     }