From c54b7bfe78ad4854e4608c04f3a1ddf5c51d6079 Mon Sep 17 00:00:00 2001
From: Marius Robert Macamete <macamete.robert@gmail.com>
Date: Thu, 6 Nov 2025 11:24:04 +0200
Subject: [PATCH] fix name not show issue

---
 UI_V2/pages/profile/profilepage.py | 28 ++++++++++++++++++++++++----
 UI_V2/pages/shopping_cart/cart.py  | 28 ++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/UI_V2/pages/profile/profilepage.py b/UI_V2/pages/profile/profilepage.py
index af2b79d..5fdaa26 100644
--- a/UI_V2/pages/profile/profilepage.py
+++ b/UI_V2/pages/profile/profilepage.py
@@ -9,26 +9,46 @@ class ProfilePage:
         self.company_manager = Company()
         self.user = self.page.session.get("user")
         self.company = self.company_manager.get_company(self.user['id'])
+        prenume = ''
+        if "@default.com" not in self.user['email']:
+            if '~' in self.user['name']:
+                prenume = self.user['name'].split('~')[0] 
         self.first_name = ft.TextField(
             label="Prenume",
-            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
+            value=prenume
         )
+        nume = ''
+        if "@default.com" not in self.user['email']:
+            if '~' in self.user['name']:
+                nume = self.user['name'].split('~')[1] 
         self.last_name = ft.TextField(
             label="Nume",
-            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
+            value=nume
         )
         self.email = ft.TextField(label="E-mail", value=self.user['email'], read_only=True)
         self.phone = ft.TextField(label="Telefon", value=self.user['phone'])
+        address = ''
+        if self.user['address']:
+            if "~" in self.user['address']:
+                address = self.user['address'].split("~")[0].split("%")[1]
+            else:
+                address = self.user['address'].split("%")[1]
         self.address = ft.TextField(
             label="Strada si numar", 
             multiline=True, 
             min_lines=3, 
             max_lines=5, 
-            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address']  else ''
+            value = address
         )
+        city = ''
+        if self.user['address']:
+            if "~" in self.user['address']:
+                city = self.user['address'].split("~")[0].split("%")[0]
+            else:
+                city = self.user['address'].split("%")[0]
         self.city = ft.TextField(
             label="Oras",
-            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
+            value = city
         )
         self.company_name = ft.TextField(
             label="Denumire firma", 
diff --git a/UI_V2/pages/shopping_cart/cart.py b/UI_V2/pages/shopping_cart/cart.py
index c4d4dbe..49f446e 100644
--- a/UI_V2/pages/shopping_cart/cart.py
+++ b/UI_V2/pages/shopping_cart/cart.py
@@ -86,13 +86,21 @@ class Cart:
         )
         self.user = self.page.session.get("user")
         self.company = self.company_manager.get_company(self.user['id'])
+        prenume = ''
+        if "@default.com" not in self.user['email']:
+            if '~' in self.user['name']:
+                prenume = self.user['name'].split('~')[0] 
         self.first_name = ft.TextField(
             label="Prenume",
-            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
+            value=prenume
         )
+        nume = ''
+        if "@default.com" not in self.user['email']:
+            if '~' in self.user['name']:
+                nume = self.user['name'].split('~')[1] 
         self.last_name = ft.TextField(
             label="Nume",
-            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
+            value=nume
         )
 
         self.email = ft.TextField(
@@ -104,16 +112,28 @@ class Cart:
             label="Telefon", 
             value=self.user['phone'] if "@default.com" not in self.user['email'] else None
         )
+        address = ''
+        if self.user['address']:
+            if "~" in self.user['address']:
+                address = self.user['address'].split("~")[0].split("%")[1]
+            else:
+                address = self.user['address'].split("%")[1]
         self.address = ft.TextField(
             label="Strada si numar", 
             multiline=True, 
             min_lines=3, 
             max_lines=5, 
-            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address']  else ''
+            value = address
         )
+        city = ''
+        if self.user['address']:
+            if "~" in self.user['address']:
+                city = self.user['address'].split("~")[0].split("%")[0]
+            else:
+                city = self.user['address'].split("%")[0]
         self.city = ft.TextField(
             label="Oras",
-            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
+            value = city
         )
 
         self.company_name = ft.TextField(