UIU-2964 - refine and clean

folio-org · Nov 15, 2023 · f515ba0 · f515ba0
1 parent 2342d23
commit f515ba0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 32 deletions.
diff --git a/src/constants.js b/src/constants.js
@@ -348,7 +348,3 @@ export const USER_TYPES = {
   SYSTEM: 'system',
   DCB: 'dcb',
 };
-
-export const DCB_USER = {
-  lastName: 'DcbSystem'
-};
diff --git a/src/utils.js b/src/utils.js
diff --git a/src/utils.test.js b/src/utils.test.js
diff --git a/src/views/LoanDetails/LoanDetails.js b/src/views/LoanDetails/LoanDetails.js
@@ -42,9 +42,9 @@ import {
   getRenewalPatronBlocksFromPatronBlocks,
   accountsMatchStatus,
   checkUserActive,
+  isDcbUser,
 } from '../../components/util';
 import { itemStatuses, loanActions, refundClaimReturned } from '../../constants';
-import { isAVirtualPatron } from '../../utils';
 import {
   withRenew,
   withDeclareLost,
@@ -488,7 +488,7 @@ class LoanDetails extends React.Component {
     const patronBlocksForModal = getRenewalPatronBlocksFromPatronBlocks(patronBlocks);
     const isUserActive = user ? checkUserActive(user) : false;
     const borrower = user ? getFullName(user) : <FormattedMessage id="ui-users.user.unknown" />;
-    const isVirtualPatron = isAVirtualPatron(user?.personal?.lastName);
+    const isVirtualPatron = isDcbUser(user);
 
     return (
       <div data-test-loan-actions-history>

diff --git a/src/views/LoanDetails/LoanDetails.test.js b/src/views/LoanDetails/LoanDetails.test.js
@@ -6,7 +6,6 @@ import okapiOpenLoan from 'fixtures/openLoan';
 import okapiCurrentUser from 'fixtures/okapiCurrentUser';
 import renderWithRouter from 'helpers/renderWithRouter';
 import LoanDetails from './LoanDetails';
-import { DCB_USER } from '../../constants';
 
 jest.useFakeTimers('legacy');
 jest.mock('react-intl', () => ({
@@ -498,9 +497,7 @@ describe('LoanDetails', () => {
       ...propsData,
       user: {
         ...propsData.user,
-        personal: {
-          lastName: DCB_USER.lastName
-        }
+        type: 'dcb',
       }
     };