fix contact name in replies

dist/sw.js

@@ -1,4 +1,4 @@
-const VERSION = "2610 Beta 12"
+const VERSION = "2610 Beta 14"
 
 function processUrl(event) {
     const url = event.request.url;

dist/version.txt

@@ -1 +1 @@
-2610 Beta 12
+2610 Beta 14

src/Model/Global/storageModel.ts

@@ -6,6 +6,7 @@ import {
     stringify,
 } from "../Utility/utility";
 import { DATA_VERSION, ValidObject } from "../Utility/typeSafety";
+import ChatModel from "../Chat/chatModel";
 
 export const PATH_COMPONENT_SEPARATOR = "\\";
 
@@ -217,21 +218,12 @@ export default class StorageModel {
 
     // upgrade 
     readonly upgrade = (): void => {
-	const v2To2610 = () => {
-	    this.recurse(["v2"], (path) => {
-		const body = this.read(path);
-		if (!body) return;
-		const parsed = parse(body);
-		console.log(parsed.type);
-	    });
-	}	
-
-	v2To2610();
+	// function used to upgrade data versions
     }
 
     // init
     constructor() {
-        this.initializeTree();
+	this.initializeTree();
 	this.upgrade();
     }
 

src/View/Components/chatMessage.tsx

@@ -30,7 +30,7 @@ export function ChatMessage(
     return (
         <div
             class="message-bubble"
-            id={chatMessageViewModel.chatMessage.id}
+            id={chatMessageViewModel.chatMessage.fileId}
             toggle:sentbyuser={chatMessageViewModel.sentByUser}
             toggle:hidden={chatMessageViewModel.isHidden}
         >

src/View/Components/inlineReply.tsx

@@ -1,8 +1,9 @@
 import { ViewController } from "../viewController";
 import * as React from "../../react";
 import ChatMessageViewModel from "../../ViewModel/Chat/chatMessageViewModel";
+import {ContactViewModel} from "../../ViewModel/Global/contactViewModel";
 
-export function InlineReply(chatMessageViewModel: ChatMessageViewModel) {
+export function InlineReply(chatMessageViewModel: ChatMessageViewModel ) {
     const reply = chatMessageViewModel.inlineReply;
     if (reply == undefined) return <div></div>;
 
@@ -12,7 +13,7 @@ export function InlineReply(chatMessageViewModel: ChatMessageViewModel) {
 
     return (
         <div class="inline-reply" on:click={scroll}>
-            <span>{reply.senderId}</span>
+	    <span subscribe:innerText={reply.contact.name}></span>
             <b class="ellipsis" subscribe:innerText={reply.body}></b>
         </div>
     );

src/View/Components/replyPreview.tsx

@@ -7,24 +7,24 @@ export function ReplyPreview(
     chatMessageViewModel: ChatMessageViewModel,
 ) {
     return (
-        <div class="reply-preview">
-            <div class="surface blur">
-                <span class="secondary">{chatMessageViewModel.senderId}</span>
-                <b
-                    class="ellipsis"
-                    subscribe:innerText={chatMessageViewModel.body}
-                ></b>
-            </div>
-            <button
-                class="standard square blur"
-                on:click={chatMessageViewModel.cancelReply}
-                aria-label={
-                    coreViewModel.translations.chatPage.message
-                        .cancelReplyAudioLabel
-                }
-            >
-                <span class="icon">close</span>
-            </button>
-        </div>
+	<div class="reply-preview">
+	    <div class="surface blur">
+		<span class="secondary" subscribe:innerText={chatMessageViewModel.contact.name}></span>
+		<b
+		    class="ellipsis"
+		    subscribe:innerText={chatMessageViewModel.body}
+		></b>
+	    </div>
+	    <button
+		class="standard square blur"
+		on:click={chatMessageViewModel.cancelReply}
+		aria-label={
+		    coreViewModel.translations.chatPage.message
+		    .cancelReplyAudioLabel
+		}
+	    >
+		<span class="icon">close</span>
+	    </button>
+	</div>
     );
 }

src/ViewModel/Chat/chatMessageViewModel.ts

@@ -146,7 +146,7 @@ export default class ChatMessageViewModel {
         const selectedMessage =
             this.messagePageViewModel.replyViewSelectedMessage.value;
         if (selectedMessage == undefined) hideForReplyView = false;
-        else if (selectedMessage.chatMessage.id == this.chatMessage.id)
+        else if (selectedMessage.chatMessage.fileId == this.chatMessage.fileId)
             hideForReplyView = false;
         else if (
             this.inlineReply != undefined &&