From fa4d180eed80eb7e6dbf9049506612bdee0e1bf7 Mon Sep 17 00:00:00 2001
From: Raju Udava <sivadstala@gmail.com>
Date: Thu, 25 Nov 2021 12:51:46 +0530
Subject: [PATCH] feat: user name for updates from shared base displayed
 accordingly

Signed-off-by: Raju Udava <sivadstala@gmail.com>
---
 packages/nc-gui/components/project/auditTab/audit.vue           | 2 +-
 .../components/project/spreadsheet/components/expandedForm.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/auditTab/audit.vue b/packages/nc-gui/components/project/auditTab/audit.vue
index 757b819557..0417caf054 100644
--- a/packages/nc-gui/components/project/auditTab/audit.vue
+++ b/packages/nc-gui/components/project/auditTab/audit.vue
@@ -48,7 +48,7 @@
               {{ audit.description }}
             </td>
             <td class="caption">
-              {{ audit.user }}
+              {{ audit.user == null?'Shared base':audit.user }}
             </td>
             <!--          <td class="caption">-->
             <!--            {{ audit.ip }}-->
diff --git a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
index 9dfd3ce3f1..a45eed53df 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue
@@ -187,7 +187,7 @@
                   </v-list-item-icon>
                   <div class="flex-grow-1" style="min-width: 0">
                     <p class="mb-1 caption edited-text">
-                      {{ isYou(log.user) ? 'You' : log.user }} {{
+                      {{ isYou(log.user) ? 'You' : log.user==null?'Shared base':log.user }} {{
                         log.op_type === 'COMMENT' ? 'commented' : (
                           log.op_sub_type === 'INSERT' ? 'created' : 'edited'
                         )