Squashed commit of the following:

commit 9727f60 Merge: 39ca5f1 f43eea2 Author: kevkevin <[email protected]> Date: Fri Feb 2 16:35:26 2024 -0600 Merge pull request stakwork#94 from ChetanKarwa/Profile-fix-closing-create-bounty Profile Tab: Fix improper navigation on closing create bounty tab commit f43eea2 Author: ChetanKarwa <[email protected]> Date: Wed Jan 31 02:12:25 2024 +0530 write test for the navigation fix commit b94b71a Author: ChetanKarwa <[email protected]> Date: Tue Jan 30 17:16:08 2024 +0530 Profile Tab: Fix closing create bounty tab commit 39ca5f1 Merge: aae07e5 8c4789a Author: kevkevin <[email protected]> Date: Fri Feb 2 16:18:22 2024 -0600 Merge pull request stakwork#135 from Fog3211/fix/tagColor Update color of tags to be visible commit 8c4789a Author: Fog3211 <[email protected]> Date: Fri Feb 2 08:55:37 2024 +0800 fix: update the tag color of Elastic search Language commit aae07e5 Merge: dc9231d 98c8144 Author: Raphael Osaze Eyerin <[email protected]> Date: Fri Feb 2 21:48:19 2024 +0100 Merge pull request stakwork#141 from stakwork/fix/add_tests Added tests removed by Saif commit 98c8144 Author: elraphty <[email protected]> Date: Fri Feb 2 20:48:23 2024 +0100 added tests remove by Saif commit dc9231d Merge: 018b868 cf194ff Author: Raphael Osaze Eyerin <[email protected]> Date: Fri Feb 2 17:54:36 2024 +0100 Merge pull request stakwork#126 from Vayras/goBackFix Go Back Fix issue stakwork#87 commit cf194ff Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 22:06:14 2024 +0530 prettier fix commit 31add2c Merge: 58328db 018b868 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 22:03:48 2024 +0530 Merge branch 'master' into goBackFix commit 018b868 Merge: 070a063 c380fcc Author: Raphael Osaze Eyerin <[email protected]> Date: Fri Feb 2 15:56:28 2024 +0100 Merge pull request stakwork#32 from Khaalid-oh/saif/bounty Create description box for org home page #1318 commit c380fcc Author: Khaalid-oh <[email protected]> Date: Fri Feb 2 15:43:04 2024 +0100 issues fixed commit 070a063 Merge: 5821873 b9d79f3 Author: Raphael Osaze Eyerin <[email protected]> Date: Fri Feb 2 15:35:21 2024 +0100 Merge pull request stakwork#138 from vishnu552/savebuttondisable save button disable in edit Organization commit 5821873 Merge: ee275b4 830e996 Author: Raphael Osaze Eyerin <[email protected]> Date: Fri Feb 2 15:26:10 2024 +0100 Merge pull request stakwork#139 from vishnu552/peopleprofilestyle Make people profile space consistent commit f66667b Author: Khaalid-oh <[email protected]> Date: Fri Feb 2 14:45:56 2024 +0100 issues fixed commit 0a801a6 Author: Khaalid-oh <[email protected]> Date: Fri Feb 2 12:51:33 2024 +0100 issues fixed commit 9acaa86 Author: Khaalid-oh <[email protected]> Date: Fri Feb 2 12:46:47 2024 +0100 issues fixed commit 830e996 Author: vishnu suthar <[email protected]> Date: Fri Feb 2 13:45:18 2024 +0530 test fix commit 4427da0 Author: vishnu suthar <[email protected]> Date: Fri Feb 2 13:43:19 2024 +0530 inconsistent space profile on people page commit b9d79f3 Author: vishnu suthar <[email protected]> Date: Fri Feb 2 13:18:22 2024 +0530 test error fixed commit 1a1c4a9 Author: vishnu suthar <[email protected]> Date: Fri Feb 2 12:58:17 2024 +0530 save button disable when user type more than limit commit 58328db Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 09:44:06 2024 +0530 test fix attempt commit 6b08be1 Merge: cac5919 769139e Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 09:42:57 2024 +0530 Merge branch 'goBackFix' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix commit 8787d9a Merge: fb5c06d ee275b4 Author: Khalid Sulyman <[email protected]> Date: Thu Feb 1 21:46:29 2024 +0100 Merge branch 'stakwork:master' into saif/bounty commit ee275b4 Merge: a6f748f d7c0c19 Author: kevkevin <[email protected]> Date: Thu Feb 1 14:00:21 2024 -0600 Merge pull request stakwork#65 from Vayras/OrgAutoPopulate Org auto populate commit a6f748f Merge: 763c408 4eedc60 Author: kevkevin <[email protected]> Date: Thu Feb 1 13:51:09 2024 -0600 Merge pull request stakwork#118 from MahtabBukhari/resolve-open-bouties-hover-affect-issue resolve open bounties background disappear on hover issue commit 769139e Author: kevkevin <[email protected]> Date: Thu Feb 1 13:38:39 2024 -0600 testing to see if this helps the issue commit 763c408 Merge: f6a24e8 5a3b7f1 Author: kevkevin <[email protected]> Date: Thu Feb 1 13:32:10 2024 -0600 Merge pull request stakwork#63 from ChetanKarwa/TribesPage/fix-tags-dropdown Tribes page - Fix tags dropdown in tribes page commit 4205fcb Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:53:18 2024 +0530 Revert "jest fix" This reverts commit 2edaf22. commit ece4988 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:47:28 2024 +0530 jest fix commit 2c601a5 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:19:09 2024 +0530 go back fix commit cac5919 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:53:18 2024 +0530 Revert "jest fix" This reverts commit 2edaf22. commit 2edaf22 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:47:28 2024 +0530 jest fix commit ca7a630 Merge: 64396a8 f6a24e8 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:29:22 2024 +0530 Merge branch 'master' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix commit 64396a8 Author: Tushar Vyas <[email protected]> Date: Fri Feb 2 00:19:09 2024 +0530 go back fix commit f6a24e8 Merge: a4b4863 cbb23ea Author: kevkevin <[email protected]> Date: Thu Feb 1 12:43:30 2024 -0600 Merge pull request stakwork#110 from VividhPandey003/resize Fix#107: Resize "manage role" window commit a4b4863 Merge: ac559df 5bf0a04 Author: kevkevin <[email protected]> Date: Thu Feb 1 12:36:08 2024 -0600 Merge pull request stakwork#67 from KumarNayan/master Test cases for frontend/app/src/pages/tickets/TicketModalPage.tsx commit ac559df Merge: b31a59b 27883e4 Author: kevkevin <[email protected]> Date: Thu Feb 1 10:41:25 2024 -0600 Merge pull request stakwork#95 from ChetanKarwa/fix-badge-modal Profile: fix claim badge modal text label overlap commit fb5c06d Merge: 8c324e4 b31a59b Author: Khalid Sulyman <[email protected]> Date: Thu Feb 1 17:13:51 2024 +0100 Merge branch 'stakwork:master' into saif/bounty commit b31a59b Merge: 385c68e 4e98a41 Author: kevkevin <[email protected]> Date: Thu Feb 1 09:41:49 2024 -0600 Merge pull request stakwork#109 from adeel-ahmad-sh/people-page-alignment fix the alignment issue in people page commit 4e98a41 Author: Adeel Ahmad <[email protected]> Date: Thu Feb 1 00:45:41 2024 +0500 fix the alignment issue in people page commit 4eedc60 Author: MahtabBukhari <[email protected]> Date: Thu Feb 1 20:10:13 2024 +0500 fix conflicts commit 385c68e Merge: 21767f6 6da1f61 Author: kevkevin <[email protected]> Date: Thu Feb 1 08:49:36 2024 -0600 Merge pull request stakwork#114 from aliraza556/disable-icon-user-side Display Block Icon on Disabled User Action Buttons `settings and delete` commit cbb23ea Merge: f4f08a5 21767f6 Author: Vividh Pandey <[email protected]> Date: Thu Feb 1 18:50:42 2024 +0530 Merge branch 'stakwork:master' into resize commit 8c324e4 Merge: fef852a 21767f6 Author: Khalid Sulyman <[email protected]> Date: Thu Feb 1 13:51:30 2024 +0100 Merge branch 'master' into saif/bounty commit 27883e4 Author: ChetanKarwa <[email protected]> Date: Thu Feb 1 18:15:15 2024 +0530 fix test case commit 7842547 Author: MahtabBukhari <[email protected]> Date: Thu Feb 1 17:44:13 2024 +0500 remaining two files commit f356199 Author: MahtabBukhari <[email protected]> Date: Thu Feb 1 17:38:57 2024 +0500 fixed branch conflict commit 6da1f61 Author: aliraza556 <[email protected]> Date: Thu Feb 1 15:14:40 2024 +0500 fix(super-admin): fixed super-admin unit test commit 46720f1 Author: aliraza556 <[email protected]> Date: Thu Feb 1 15:10:05 2024 +0500 fix(disable-icon): fixed disable icon in settings and delete button commit f4f08a5 Author: Vividh Pandey <[email protected]> Date: Thu Feb 1 02:20:16 2024 +0530 fixed modal size Signed-off-by: Vividh Pandey <[email protected]> commit 19a282f Author: ChetanKarwa <[email protected]> Date: Thu Feb 1 00:32:25 2024 +0530 resolve comments commit fef852a Author: Khaalid-oh <[email protected]> Date: Wed Jan 31 19:23:14 2024 +0100 feature:create description box for org home page #1318 commit a99c9bc Author: Khaalid-oh <[email protected]> Date: Wed Jan 31 18:55:15 2024 +0100 feature:create description box for org home page #1318 commit 83be9ef Merge: ae45784 ca0967a Author: Khaalid-oh <[email protected]> Date: Wed Jan 31 18:48:45 2024 +0100 feat: create organization description comment :wq Merge branch 'saif/bounty' of https://github.com/Khaalid-oh/sphinx-tribes-frontend into saif/bounty :qa commit ca0967a Merge: a17f81d 76604f7 Author: Khalid Sulyman <[email protected]> Date: Wed Jan 31 18:45:50 2024 +0100 Merge branch 'stakwork:master' into saif/bounty commit ae45784 Author: Khaalid-oh <[email protected]> Date: Wed Jan 31 18:45:06 2024 +0100 feature:create description box for org home page #1318 commit 9876b9b Author: ChetanKarwa <[email protected]> Date: Wed Jan 31 02:59:01 2024 +0530 Profile: fix claim badge modal text label overlap commit 5bf0a04 Author: Kumar Nayan <[email protected]> Date: Tue Jan 30 21:47:33 2024 +0530 Fixed failing tests commit e2ff843 Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 23:39:09 2024 +0530 fixed tests commit a17f81d Author: Khaalid-oh <[email protected]> Date: Mon Jan 29 18:28:16 2024 +0100 feature:create description box for org home page #1318 commit 504f099 Author: Khaalid-oh <[email protected]> Date: Mon Jan 29 18:17:01 2024 +0100 feature:create description box for org home page #1318 commit 5a3b7f1 Author: ChetanKarwa <[email protected]> Date: Mon Jan 29 22:46:56 2024 +0530 add test for no results condition commit bdab6f1 Author: Khaalid-oh <[email protected]> Date: Mon Jan 29 18:16:31 2024 +0100 feature:create description box for org home page #1318 commit 44bc00f Author: Khaalid-oh <[email protected]> Date: Mon Jan 29 18:15:25 2024 +0100 feature:create description box for org home page #1318 commit 2a6ef9d Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 22:39:54 2024 +0530 test commit a065e00 Merge: fe52ad4 a50c6ca Author: Khalid Sulyman <[email protected]> Date: Mon Jan 29 18:01:25 2024 +0100 Merge branch 'master' into saif/bounty commit fe52ad4 Author: Khaalid-oh <[email protected]> Date: Mon Jan 29 17:39:36 2024 +0100 feature:create description box for org home page #1318 commit 3dff8a1 Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 22:02:57 2024 +0530 fixed failing tests commit 79cd8c0 Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 21:55:08 2024 +0530 Fixed conflict issues commit 9e25e5c Merge: 60b1e93 a50c6ca Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 21:50:07 2024 +0530 Merge branch 'master' into master commit 60b1e93 Author: Kumar Nayan <[email protected]> Date: Mon Jan 29 21:39:06 2024 +0530 Test cases commit d7c0c19 Author: Tushar Vyas <[email protected]> Date: Mon Jan 29 21:26:32 2024 +0530 eslint fix commit 0a0f222 Author: Tushar Vyas <[email protected]> Date: Mon Jan 29 21:11:47 2024 +0530 review changes commit 7346ad5 Author: Tushar Vyas <[email protected]> Date: Mon Jan 29 20:48:49 2024 +0530 Auto populate correct org commit 91a1a6c Author: ChetanKarwa <[email protected]> Date: Mon Jan 29 18:30:08 2024 +0530 retrigger test check commit 0825ea4 Merge: 8d47802 1cc7208 Author: Khalid Sulyman <[email protected]> Date: Mon Jan 29 09:39:53 2024 +0100 Merge branch 'stakwork:master' into saif/bounty commit 8bea653 Author: ChetanKarwa <[email protected]> Date: Mon Jan 29 13:52:41 2024 +0530 fix prettier issues commit 159bcc1 Author: ChetanKarwa <[email protected]> Date: Mon Jan 29 13:52:01 2024 +0530 fix tags dropdown commit 8d47802 Merge: c0084e4 8fabda3 Author: Khalid Sulyman <[email protected]> Date: Fri Jan 26 18:38:49 2024 +0100 Merge branch 'stakwork:master' into saif/bounty commit c0084e4 Author: Khalid Sulyman <[email protected]> Date: Thu Jan 25 22:46:56 2024 +0100 feat:description box for org home page #1318 commit a3e8684 Author: Khalid Sulyman <[email protected]> Date: Thu Jan 25 22:44:10 2024 +0100 feat:description box for org home page #1318
jordan-ae · Feb 3, 2024 · 75103c0 · 75103c0
1 parent 6fba8a2
commit 75103c0
Show file tree

Hide file tree

Showing 32 changed files with 1,205 additions and 625 deletions.
diff --git a/public/static/unassigned_bounty_hover_bg.svg b/public/static/unassigned_bounty_hover_bg.svg
diff --git a/src/components/common/Button.tsx b/src/components/common/Button.tsx
@@ -21,6 +21,12 @@ const B = styled(EuiButton)`
   text-transform: none !important;
   text-decoration: none !important;
   transform: none !important;
+  :disabled {
+    border: 1px solid rgba(0, 0, 0, 0.07);
+    background: rgba(0, 0, 0, 0.04);
+    color: rgba(142, 150, 156, 0.85);
+    box-shadow: none;
+  }
   @media only screen and (max-width: 700px) {
     font-size: 12.5px;
   }

diff --git a/src/components/common/TextInput.tsx b/src/components/common/TextInput.tsx
@@ -2,17 +2,17 @@ import React from 'react';
 import styled from 'styled-components';
 import { TextInputProps } from 'components/interfaces';
 import { colors } from '../../config/colors';
-import { FieldEnv, FieldText } from '../form/inputs/index';
+import { FieldText } from '../form/inputs/index';
 
-const F = styled((props: any) => <FieldEnv {...props} />)`
-  .euiFormLabel[for] {
-    cursor: default;
-  }
+const StyledLabel = styled.span`
+  font-family: Barlow;
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  display: flex;
+  margin-bottom: 4px;
 `;
 
-const R = styled.div`
-  position: relative;
-`;
 export default function TextInput({
   label,
   value,
@@ -25,22 +25,19 @@ export default function TextInput({
 }: TextInputProps) {
   const color = colors['light'];
   return (
-    <>
-      <F label={label}>
-        <R>
-          <FieldText
-            color={color}
-            name="first"
-            value={value || ''}
-            readOnly={readOnly || false}
-            onChange={(e: any) => onChange(e.target.value)}
-            onBlur={handleBlur}
-            onFocus={handleFocus}
-            prepend={prepend}
-            style={style}
-          />
-        </R>
-      </F>
-    </>
+    <div>
+      <StyledLabel>{label}</StyledLabel>
+      <FieldText
+        color={color}
+        name="first"
+        value={value || ''}
+        readOnly={readOnly || false}
+        onChange={(e: any) => onChange(e.target.value)}
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+        prepend={prepend}
+        style={style}
+      />
+    </div>
   );
 }
diff --git a/src/components/form/inputs/TextAreaInputNew.tsx b/src/components/form/inputs/TextAreaInputNew.tsx
@@ -94,8 +94,6 @@ export default function TextAreaInputNew({
           setShowPlaceholder(false);
         }}
         onBlur={() => {
-          setCharacterError(false);
-          setColor && setColor(false, name);
           handleBlur();
           if (error) {
             setIsError(true);
@@ -150,7 +148,7 @@ export default function TextAreaInputNew({
       >
         {labeltext}
       </label>
-      {characterError ? <ErrorText>description is too long</ErrorText> : null}
+      {characterError ? <ErrorText>Description is too long</ErrorText> : null}
     </InputOuterBox>
   );
 }
diff --git a/src/components/form/inputs/TextInputNew2.tsx b/src/components/form/inputs/TextInputNew2.tsx
@@ -76,8 +76,6 @@ export default function TextInputNew({
         value={textValue}
         onFocus={handleFocus}
         onBlur={() => {
-          setCharacterError(false);
-          setColor && setColor(false, name);
           handleBlur();
           if (error) {
             setIsError(true);

diff --git a/src/components/form/style.ts b/src/components/form/style.ts
@@ -15,7 +15,7 @@ export const Wrap = styled.div<WrapProps>`
   height: inherit;
   flex-direction: column;
   align-content: center;
-  min-width: 600px;
+  min-width: auto;
 `;
 
 export const OrgWrap = styled.div<WrapProps>`

diff --git a/src/pages/people/Person.tsx b/src/pages/people/Person.tsx
@@ -197,7 +197,7 @@ export default function Person(props: PersonProps) {
             <div style={{ height: 210 }}>
               <Img style={{ height: '100%', width: '100%', borderRadius: 0 }} src={img} />
             </div>
-            <div style={{ padding: 16 }}>
+            <div style={{ padding: 11 }}>
               <DTitle>{owner_alias}</DTitle>
               {description && description !== 'description' && (
                 <DDescription>{description}</DDescription>

diff --git a/src/pages/people/peopleList/PeopleList.tsx b/src/pages/people/peopleList/PeopleList.tsx
@@ -80,7 +80,7 @@ export const PeopleList = observer(() => {
 
   function goBack() {
     ui.setSelectingPerson(0);
-    history.goBack();
+    history.replace('/p');
   }
 
   function selectPerson(id: number, unique_name: string, pubkey: string) {

diff --git a/src/pages/people/tabs/CreatedBountyLoadMore.spec.tsx b/src/pages/people/tabs/CreatedBountyLoadMore.spec.tsx
@@ -1,10 +1,22 @@
 import React from 'react';
-import { render, fireEvent, waitFor } from '@testing-library/react';
+import { render, fireEvent, waitFor, cleanup } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
+import { usePerson } from 'hooks';
+import { useStores } from 'store';
 import mockBounties from '../../../bounties/__mock__/mockBounties.data';
 import '@testing-library/jest-dom/extend-expect';
 import { Wanted } from './Wanted';
 
+jest.mock('hooks', () => ({
+  ...jest.requireActual('hooks'),
+  usePerson: jest.fn()
+}));
+
+jest.mock('store', () => ({
+  ...jest.requireActual('store'),
+  useStores: jest.fn()
+}));
+
 // eslint-disable-next-line @typescript-eslint/typedef
 const createdMockBounties = Array.from({ length: 15 }, (_, index) => ({
   ...(mockBounties[0] || {}),
@@ -14,14 +26,38 @@ const createdMockBounties = Array.from({ length: 15 }, (_, index) => ({
   }
 }));
 
-console.log(createdMockBounties);
+describe('Wanted component', () => {
+  beforeEach(() => {
+    // Setup before each test. If there's a common mock implementation, define it here.
+  });
 
-jest.mock('../../../bounties/__mock__/mockBounties.data', () => ({
-  createdMockBounties
-}));
+  afterEach(() => {
+    // Cleanup after each test. Resetting all mocks ensures that one test does not affect another.
+    jest.resetAllMocks();
+    cleanup();
+  });
 
-describe('Wanted component', () => {
   it('displays "Load More" button when scrolling down', async () => {
+    // Mock implementation specific to this test, if any
+
+    (usePerson as jest.Mock).mockImplementation(() => ({
+      person: {},
+      canEdit: false
+    }));
+
+    (useStores as jest.Mock).mockReturnValue({
+      main: {
+        getPersonCreatedBounties: jest.fn(() => []),
+        dropDownOrganizations: []
+      },
+      ui: {
+        selectedPerson: '123',
+        meInfo: {
+          owner_alias: 'test'
+        }
+      }
+    });
+
     const { getByText } = render(
       <MemoryRouter>
         <Wanted />
@@ -30,14 +66,57 @@ describe('Wanted component', () => {
 
     fireEvent.scroll(window, { target: { scrollY: 1000 } });
 
-    // Wait for the component to re-render (assuming there's an API call)
     await waitFor(() => {
-      // Check if the "Load More" button is displayed
       if (createdMockBounties.length > 20) {
         expect(getByText('Load More')).toBeInTheDocument();
       } else {
         console.warn('Not enough bounties for "Load More" button.');
       }
     });
   });
+
+  test('Add new ticket modal on close should not navigate back in history', async () => {
+    // Mock implementation specific to this test
+    (usePerson as jest.Mock).mockImplementation(() => ({
+      person: {},
+      canEdit: true
+    }));
+
+    (useStores as jest.Mock).mockReturnValue({
+      main: {
+        getPersonCreatedBounties: jest.fn(() => []),
+        dropDownOrganizations: []
+      },
+      ui: {
+        selectedPerson: '123',
+        meInfo: {
+          owner_alias: 'test'
+        }
+      }
+    });
+
+    const { getByText, getByAltText } = render(
+      <MemoryRouter>
+        <Wanted />
+      </MemoryRouter>
+    );
+
+    const currentPathname = window.location.pathname;
+
+    fireEvent.scroll(window, { target: { scrollY: 1000 } });
+
+    await waitFor(() => {
+      expect(getByText('Add New Ticket')).toBeInTheDocument();
+    });
+
+    fireEvent.click(getByText('Add New Ticket'));
+
+    await waitFor(() => {
+      expect(getByAltText('close_svg')).toBeInTheDocument();
+    });
+
+    fireEvent.click(getByAltText('close_svg'));
+
+    expect(window.location.pathname).toEqual(currentPathname);
+  });
 });
diff --git a/src/pages/people/tabs/Wanted.tsx b/src/pages/people/tabs/Wanted.tsx
@@ -107,12 +107,8 @@ export const Wanted = observer(() => {
               }}
               widget={'wanted'}
               onSucces={() => {
-                history.goBack();
                 window.location.reload();
               }}
-              onGoBack={() => {
-                history.goBack();
-              }}
             />
           )
         }

diff --git a/src/pages/tickets/TicketModalPage.tsx b/src/pages/tickets/TicketModalPage.tsx
@@ -1,14 +1,14 @@
+import React, { useEffect, useState, useMemo, useCallback } from 'react';
+import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { Modal } from 'components/common';
 import { colors } from 'config';
 import { useIsMobile } from 'hooks';
 import { observer } from 'mobx-react-lite';
-import FocusedView from 'people/main/FocusView';
-import { widgetConfigs } from 'people/utils/Constants';
-import React, { useEffect, useState, useMemo, useCallback } from 'react';
-import { useHistory, useLocation, useParams } from 'react-router-dom';
-import { AlreadyDeleted } from 'components/common/AfterDeleteNotification/AlreadyDeleted';
-import { useStores } from 'store';
-import { PersonBounty } from 'store/main';
+import FocusedView from '../../people/main/FocusView';
+import { widgetConfigs } from '../../people/utils/Constants';
+import { AlreadyDeleted } from '../../components/common/AfterDeleteNotification/AlreadyDeleted';
+import { useStores } from '../../store';
+import { PersonBounty } from '../../store/main';
 
 const color = colors['light'];
 const focusedDesktopModalStyles = widgetConfigs.wanted.modalStyle;