From 4e37064f477101902099411c4b59aa72c60d79ba Mon Sep 17 00:00:00 2001
From: Nariman Jelveh <n.jelveh@gmail.com>
Date: Sat, 17 Aug 2024 11:34:53 -0700
Subject: [PATCH] fix issues public folder paths

---
 src/gui/src/UI/UIItem.js                      | 4 ++--
 src/gui/src/UI/UIWindow.js                    | 1 -
 src/gui/src/helpers.js                        | 1 +
 src/gui/src/helpers/update_username_in_gui.js | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gui/src/UI/UIItem.js b/src/gui/src/UI/UIItem.js
index 2b90b26b1..bac63d010 100644
--- a/src/gui/src/UI/UIItem.js
+++ b/src/gui/src/UI/UIItem.js
@@ -782,7 +782,7 @@ function UIItem(options){
                 // -------------------------------------------
                 menu_items.push('-');
             }
-            if(!are_trashed && (!window.user.feature_flags || window.user.feature_flags.share !== false)){
+            if(!are_trashed && (window.user.feature_flags?.share !== false)){
                 menu_items.push({
                     html: 'Share With…',
                     onClick: async function(){
@@ -1086,7 +1086,7 @@ function UIItem(options){
             // -------------------------------------------
             // Share With…
             // -------------------------------------------
-            if(!is_trashed && !is_trash  && (!window.user.feature_flags || window.user.feature_flags.share !== false)){
+            if(!is_trashed && !is_trash && (window.user.feature_flags?.share !== false)){
                 menu_items.push({
                     html: 'Share With…',
                     onClick: async function(){
diff --git a/src/gui/src/UI/UIWindow.js b/src/gui/src/UI/UIWindow.js
index 1af86ef7f..9e2d4dec2 100644
--- a/src/gui/src/UI/UIWindow.js
+++ b/src/gui/src/UI/UIWindow.js
@@ -271,7 +271,6 @@ async function UIWindow(options) {
                 h += `<div draggable="false" title="${i18n('desktop')}" class="window-sidebar-item disable-user-select ${options.path === window.desktop_path ? 'window-sidebar-item-active' : ''}" data-path="${html_encode(window.desktop_path)}"><img draggable="false" class="window-sidebar-item-icon" src="${html_encode(window.icons['folder-desktop.svg'])}">${i18n('desktop')}</div>`;
                 h += `<div draggable="false" title="${i18n('videos')}" class="window-sidebar-item disable-user-select ${options.path === window.videos_path ? 'window-sidebar-item-active' : ''}" data-path="${html_encode(window.videos_path)}"><img draggable="false" class="window-sidebar-item-icon" src="${html_encode(window.icons['folder-videos.svg'])}">${i18n('videos')}</div>`;
             h += `</div>`;
-
         }
 
         // Menubar
diff --git a/src/gui/src/helpers.js b/src/gui/src/helpers.js
index c4da07247..1ba495e25 100644
--- a/src/gui/src/helpers.js
+++ b/src/gui/src/helpers.js
@@ -488,6 +488,7 @@ window.update_auth_data = async (auth_token, user)=>{
     window.videos_path = '/' + window.user.username + '/Videos';
     window.desktop_path = '/' + window.user.username + '/Desktop';
     window.home_path = '/' + window.user.username;
+    window.public_path =  '/' + window.user.username + '/Public';
 
     if(window.user !== null && !window.user.is_temp){
         $('.user-options-login-btn, .user-options-create-account-btn').hide();
diff --git a/src/gui/src/helpers/update_username_in_gui.js b/src/gui/src/helpers/update_username_in_gui.js
index 78c2f3535..212363a3b 100644
--- a/src/gui/src/helpers/update_username_in_gui.js
+++ b/src/gui/src/helpers/update_username_in_gui.js
@@ -83,6 +83,7 @@ const update_username_in_gui = function(new_username){
     window.pictures_path = '/' + new_username + '/Pictures';
     window.videos_path = '/' + new_username + '/Videos';
     window.desktop_path = '/' + new_username + '/Desktop';
+    window.public_path = '/' + new_username + '/Public';
     window.home_path = '/' + new_username;
 }