Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-22 22:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

show incoming and current note in merge editor

Browse Source
This commit is contained in:
ammarahm-ed
2021-02-27 13:36:46 +05:00
parent 03b3dd6c6f
commit 98f20aa7c6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/mobile/src/components/MergeEditor/index.js
View File

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