From cc67caea55b2662bc0fbeb5d50dfa8eb55af1b13 Mon Sep 17 00:00:00 2001
From: elraphty <elraphtyofficial@gmail.com>
Date: Thu, 21 Sep 2023 18:47:12 +0100
Subject: [PATCH] fixed relay user save profile error

---
 frontend/app/src/people/main/FocusView.tsx    | 21 ++++++++++++-------
 .../editUserModal/EditUserDesktopView.tsx     |  1 +
 .../widgetViews/summaries/WantedSummary.tsx   |  1 +
 frontend/app/src/store/main.ts                |  6 ++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/frontend/app/src/people/main/FocusView.tsx b/frontend/app/src/people/main/FocusView.tsx
index 68f7dde1b..be34362fa 100644
--- a/frontend/app/src/people/main/FocusView.tsx
+++ b/frontend/app/src/people/main/FocusView.tsx
@@ -64,9 +64,9 @@ const B = styled.div<BProps>`
   overflow-y: auto;
   box-sizing: border-box;
   ${EnvWithScrollBar({
-    thumbColor: '#5a606c',
-    trackBackgroundColor: 'rgba(0,0,0,0)'
-  })}
+  thumbColor: '#5a606c',
+  trackBackgroundColor: 'rgba(0,0,0,0)'
+})}
 `;
 function FocusedView(props: FocusViewProps) {
   const {
@@ -103,9 +103,9 @@ function FocusedView(props: FocusViewProps) {
 
   const userOrganizations = main.organizations.length
     ? main.organizations.map((org: Organization) => ({
-        label: toCapitalize(org.name),
-        value: org.uuid
-      }))
+      label: toCapitalize(org.name),
+      value: org.uuid
+    }))
     : [];
 
   function isNotHttps(url: string | undefined) {
@@ -206,6 +206,7 @@ function FocusedView(props: FocusViewProps) {
   // eslint-disable-next-line @typescript-eslint/no-inferrable-types
   async function submitForm(body: any, shouldCloseModal: boolean = true) {
     let newBody = cloneDeep(body);
+
     if (config && config.name === 'about') {
       const res = await main.saveProfile(newBody);
       if (shouldCloseModal) {
@@ -226,9 +227,11 @@ function FocusedView(props: FocusViewProps) {
     if (!newBody.description) {
       addToast();
     }
+
     const info = ui.meInfo as any;
     if (!info) return console.log('no meInfo');
     setLoading(true);
+
     try {
       if (typeof newBody?.assignee !== 'string' || !newBody?.assignee) {
         newBody.assignee = newBody.assignee?.owner_pubkey ?? 'emptyid';
@@ -250,7 +253,9 @@ function FocusedView(props: FocusViewProps) {
     } catch (e) {
       console.log('e', e);
     }
+
     if (props?.onSuccess) props.onSuccess();
+
     setLoading(false);
     if (ui?.meInfo?.hasOwnProperty('url') && !isNotHttps(ui?.meInfo?.url) && props?.ReCallBounties)
       props?.ReCallBounties();
@@ -380,8 +385,8 @@ function FocusedView(props: FocusViewProps) {
               extraHTML={
                 ui.meInfo.verification_signature
                   ? {
-                      twitter: `<span>Post this to your twitter account to verify:</span><br/><strong>Sphinx Verification: ${ui.meInfo.verification_signature}</strong>`
-                    }
+                    twitter: `<span>Post this to your twitter account to verify:</span><br/><strong>Sphinx Verification: ${ui.meInfo.verification_signature}</strong>`
+                  }
                   : {}
               }
             />
diff --git a/frontend/app/src/people/main/editUserModal/EditUserDesktopView.tsx b/frontend/app/src/people/main/editUserModal/EditUserDesktopView.tsx
index b6bd99b86..95f14cb28 100644
--- a/frontend/app/src/people/main/editUserModal/EditUserDesktopView.tsx
+++ b/frontend/app/src/people/main/editUserModal/EditUserDesktopView.tsx
@@ -7,6 +7,7 @@ import { formConfig } from './config';
 
 export const EditUserDesktopView = observer(() => {
   const { canEdit, closeHandler, person, modals } = useUserEdit();
+
   return (
     <Modal
       visible={modals.userEditModal}
diff --git a/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx b/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx
index 86a69c364..790a232d5 100644
--- a/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx
+++ b/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx
@@ -152,6 +152,7 @@ function WantedSummary(props: WantedSummaryProps) {
         type: type,
         created: created
       };
+
       formSubmit && formSubmit(newValue);
     },
     [
diff --git a/frontend/app/src/store/main.ts b/frontend/app/src/store/main.ts
index c36521ff4..403bf4506 100644
--- a/frontend/app/src/store/main.ts
+++ b/frontend/app/src/store/main.ts
@@ -1256,12 +1256,14 @@ export class MainStore {
         // first time profile makers will need this on first login
         if (!body.id) {
           const j = await r.json();
-          if (j.response.id) {
+          if (j.response && j.response.id) {
             body.id = j.response.id;
           }
         }
 
-        await this.getSelf(body);
+        const updateSelf = { ...info, ...body };
+        await this.getSelf(updateSelf);
+
         uiStore.setToasts([
           {
             id: '1',