From c40113b577e95f2bb105fe73db8deafc0d8e8653 Mon Sep 17 00:00:00 2001
From: vashjs <vadym.shchekotilin@gmail.com>
Date: Tue, 14 Nov 2023 09:18:59 +0100
Subject: [PATCH] Resolve conflicts

---
 .../BulkEditInApp/ContentUpdatesForm/helpers.js          | 5 ++---
 src/constants/inAppActions.js                            | 9 +--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
index 8cdf7ecb..b0c30b1c 100644
--- a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
+++ b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
@@ -21,7 +21,6 @@ import {
   noteActionsWithMark,
   noteActionsWithDuplicate,
   electronicAccess,
-  urlRelationshipActions,
 } from '../../../../../constants';
 
 export const ACTION_VALUE_KEY = 'name';
@@ -300,9 +299,9 @@ export const getDefaultActions = (option, options, formatMessage) => {
         actions: [
           null,
           {
-            actionsList: urlRelationshipActions(formatMessage),
+            actionsList: electronicAccessActions,
             controlType: () => CONTROL_TYPES.ELECTRONIC_ACCESS_RELATIONSHIP_SELECT,
-            [ACTION_VALUE_KEY]: noteDefaultActions[0].value,
+            [ACTION_VALUE_KEY]: electronicAccessActions[0].value,
             [FIELD_VALUE_KEY]: '',
           },
         ],
diff --git a/src/constants/inAppActions.js b/src/constants/inAppActions.js
index 81d0cad5..2f55d303 100644
--- a/src/constants/inAppActions.js
+++ b/src/constants/inAppActions.js
@@ -153,8 +153,8 @@ export const noteActionsWithMark = (formatMessage) => [
 export const electronicAccess = (formatMessage) => [
   getPlaceholder(formatMessage),
   getClearAction(formatMessage),
-  getReplaceAction(formatMessage),
   getFindAction(formatMessage),
+  getReplaceAction(formatMessage),
 ];
 export const noteActionsWithDuplicate = (formatMessage) => [
   getPlaceholder(formatMessage),
@@ -171,10 +171,3 @@ export const commonAdditionalActions = (formatMessage) => [
   getReplaceAction(formatMessage),
   getRemoveTheseAction(formatMessage),
 ];
-
-export const urlRelationshipActions = (formatMessage) => [
-  getPlaceholder(formatMessage),
-  getClearAction(formatMessage),
-  getFindAction(formatMessage),
-  getReplaceAction(formatMessage),
-];