From 864167afc5f59673addbb6409568d714849dd331 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Thu, 4 May 2023 21:32:53 -0700
Subject: [PATCH] Use Onyx.METHOD and remove redundant CONST

---
 src/CONST.js                                  |   7 --
 src/libs/actions/App.js                       |  18 +--
 src/libs/actions/BankAccounts.js              |  28 ++---
 src/libs/actions/Chronos.js                   |   7 +-
 src/libs/actions/IOU.js                       |  96 +++++++--------
 src/libs/actions/PaymentMethods.js            |  20 +--
 src/libs/actions/PersonalDetails.js           |  24 ++--
 src/libs/actions/Plaid.js                     |  14 +--
 src/libs/actions/Policy.js                    | 114 +++++++++---------
 src/libs/actions/PushNotification.js          |   5 +-
 .../resetFreePlanBankAccount.js               |  15 +--
 src/libs/actions/Report.js                    |  88 +++++++-------
 src/libs/actions/Session/index.js             |  74 ++++++------
 src/libs/actions/User.js                      |  62 +++++-----
 src/libs/actions/Wallet.js                    |  33 +++--
 tests/actions/ReportTest.js                   |  14 +--
 tests/ui/UnreadIndicatorsTest.js              |   6 +-
 tests/utils/TestHelper.js                     |  16 +--
 18 files changed, 317 insertions(+), 324 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index e5fd70b80288..4508ae70801c 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1066,13 +1066,6 @@ const CONST = {
         // Since size cant be null, we have to define some initial value.
         INITIAL_SIZE: 1, // 1 was chosen because there is a very low probability that initialized component will have such size.
     },
-
-    ONYX: {
-        METHOD: {
-            MERGE: 'merge',
-            SET: 'set',
-        },
-    },
     MICROSECONDS_PER_MS: 1000,
     RED_BRICK_ROAD_PENDING_ACTION: {
         ADD: 'add',
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 2790765745be..c57dfe4320aa 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -96,7 +96,7 @@ function setLocale(locale) {
     // Optimistically change preferred locale
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_PREFERRED_LOCALE,
             value: locale,
         },
@@ -147,21 +147,21 @@ function openApp() {
                 API.read('OpenApp', {policyIDList: getNonOptimisticPolicyIDs(policies)}, {
                     optimisticData: [
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                             value: true,
                         },
                     ],
                     successData: [
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                             value: false,
                         },
                     ],
                     failureData: [
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                             value: false,
                         },
@@ -178,17 +178,17 @@ function openApp() {
 function reconnectApp() {
     API.write(CONST.NETWORK.COMMAND.RECONNECT_APP, {policyIDList: getNonOptimisticPolicyIDs(allPolicies)}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
             value: true,
         }],
         successData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
             value: false,
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
             value: false,
         }],
@@ -275,7 +275,7 @@ function openProfile() {
         timezone: JSON.stringify(newTimezoneData),
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -284,7 +284,7 @@ function openProfile() {
             },
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index d4a037baeef1..128b815fa59c 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -64,7 +64,7 @@ function getVBBADataForOnyx() {
     return {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: true,
@@ -74,7 +74,7 @@ function getVBBADataForOnyx() {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -84,7 +84,7 @@ function getVBBADataForOnyx() {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -141,7 +141,7 @@ function addPersonalBankAccount(account) {
     const onyxData = {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
                 value: {
                     isLoading: true,
@@ -152,7 +152,7 @@ function addPersonalBankAccount(account) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -163,7 +163,7 @@ function addPersonalBankAccount(account) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -184,7 +184,7 @@ function deletePaymentBankAccount(bankAccountID) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.BANK_ACCOUNT_LIST}`,
                 value: {[bankAccountID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
             },
@@ -194,7 +194,7 @@ function deletePaymentBankAccount(bankAccountID) {
         // so we are setting the bankAccount to null here to ensure that it gets cleared out once we come back online.
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.BANK_ACCOUNT_LIST}`,
                 value: {[bankAccountID]: null},
             },
@@ -235,7 +235,7 @@ function validateBankAccount(bankAccountID, validateCode) {
         validateCode,
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
             value: {
                 isLoading: true,
@@ -243,14 +243,14 @@ function validateBankAccount(bankAccountID, validateCode) {
             },
         }],
         successData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
             value: {
                 isLoading: false,
             },
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
             value: {
                 isLoading: false,
@@ -263,7 +263,7 @@ function openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep) {
     const onyxData = {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: true,
@@ -272,7 +272,7 @@ function openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -281,7 +281,7 @@ function openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
diff --git a/src/libs/actions/Chronos.js b/src/libs/actions/Chronos.js
index 912a05851ac0..fb3778689a60 100644
--- a/src/libs/actions/Chronos.js
+++ b/src/libs/actions/Chronos.js
@@ -1,4 +1,5 @@
 import _ from 'underscore';
+import Onyx from 'react-native-onyx';
 import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
@@ -12,7 +13,7 @@ import * as API from '../API';
 const removeEvent = (reportID, reportActionID, eventID, events) => {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -27,7 +28,7 @@ const removeEvent = (reportID, reportActionID, eventID, events) => {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -39,7 +40,7 @@ const removeEvent = (reportID, reportActionID, eventID, events) => {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 6dbd7ec6de3f..4822b700a532 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -102,7 +102,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
 
     // First, add data that will be used in all cases
     const optimisticChatReportData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
         value: {
             ...chatReport,
@@ -115,13 +115,13 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
     };
 
     const optimisticIOUReportData = {
-        onyxMethod: chatReport.hasOutstandingIOU ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+        onyxMethod: chatReport.hasOutstandingIOU ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
         key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
         value: iouReport,
     };
 
     const optimisticReportActionsData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
         value: {
             [optimisticReportAction.reportActionID]: optimisticReportAction,
@@ -130,7 +130,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
 
     let chatReportSuccessData = {};
     const reportActionsSuccessData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
         value: {
             [optimisticReportAction.reportActionID]: {
@@ -140,7 +140,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
     };
 
     const chatReportFailureData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
         value: {
             hasOutstandingIOU: chatReport.hasOutstandingIOU,
@@ -148,7 +148,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
     };
 
     const reportActionsFailureData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
         value: {
             [optimisticReportAction.reportActionID]: {
@@ -165,14 +165,14 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
     if (isNewChat) {
         // Change the method to set for new reports because it doesn't exist yet, is faster,
         // and we need the data to be available when we navigate to the chat page
-        optimisticChatReportData.onyxMethod = CONST.ONYX.METHOD.SET;
-        optimisticIOUReportData.onyxMethod = CONST.ONYX.METHOD.SET;
-        optimisticReportActionsData.onyxMethod = CONST.ONYX.METHOD.SET;
+        optimisticChatReportData.onyxMethod = Onyx.METHOD.SET;
+        optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
+        optimisticReportActionsData.onyxMethod = Onyx.METHOD.SET;
 
         // Then add and clear pending fields from the chat report
         optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
         chatReportSuccessData = {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
             value: {
                 pendingFields: null,
@@ -274,12 +274,12 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
         {
             // Use set for new reports because it doesn't exist yet, is faster,
             // and we need the data to be available when we navigate to the chat page
-            onyxMethod: existingGroupChatReport ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+            onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
             value: groupChatReport,
         },
         {
-            onyxMethod: existingGroupChatReport ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+            onyxMethod: existingGroupChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
                 ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
@@ -290,12 +290,12 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
             value: {pendingFields: {createChat: null}},
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
                 ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
@@ -306,14 +306,14 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${groupChatReport.reportID}`,
             value: {
                 pendingFields: {createChat: null},
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChatReport.reportID}`,
             value: {
                 ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: {pendingAction: null}}),
@@ -384,12 +384,12 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
 
         optimisticData.push(
             {
-                onyxMethod: existingOneOnOneChatReport ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+                onyxMethod: existingOneOnOneChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.reportID}`,
                 value: oneOnOneChatReport,
             },
             {
-                onyxMethod: existingOneOnOneChatReport ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+                onyxMethod: existingOneOnOneChatReport ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oneOnOneChatReport.reportID}`,
                 value: {
                     ...(existingOneOnOneChatReport
@@ -403,12 +403,12 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
 
         successData.push(
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.reportID}`,
                 value: {pendingFields: {createChat: null}},
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oneOnOneChatReport.reportID}`,
                 value: {
                     ...(existingOneOnOneChatReport
@@ -422,7 +422,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
 
         failureData.push(
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.reportID}`,
                 value: {
                     pendingFields: {createChat: null},
@@ -431,7 +431,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oneOnOneChatReport.reportID}`,
                 value: {
                     ...(existingOneOnOneChatReport
@@ -448,13 +448,13 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
             // We want to use set in case we are creating the the optimistic chat.
             // If we have multiple participants selected, we need to check if the 1:1 chat between the users already exists
             // If we have only one other participant, the group chat is the 1:1 chat and we need to check if that already exists
-            onyxMethod: ((hasMultipleParticipants && existingOneOnOneChatReport) || (!hasMultipleParticipants && existingGroupChatReport)) ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET,
+            onyxMethod: ((hasMultipleParticipants && existingOneOnOneChatReport) || (!hasMultipleParticipants && existingGroupChatReport)) ? Onyx.METHOD.MERGE : Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneIOUReport.reportID}`,
             value: oneOnOneIOUReport,
         });
 
         failureData.push({
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneIOUReport.reportID}`,
             value: existingIOUReport || oneOnOneIOUReport,
         });
@@ -579,7 +579,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
             value: {
                 [optimisticReportAction.reportActionID]: {
@@ -589,24 +589,24 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`,
             value: chatReport,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
             value: updatedIOUReport,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: null,
         },
     ];
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
             value: {
                 [optimisticReportAction.reportActionID]: {
@@ -617,7 +617,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
     ];
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
             value: {
                 [optimisticReportAction.reportActionID]: {
@@ -628,7 +628,7 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`,
             value: {
                 lastMessageText: chatReports[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`].lastMessageText,
@@ -637,12 +637,12 @@ function deleteMoneyRequest(chatReportID, iouReportID, moneyRequestAction, shoul
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
             value: iouReport,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: transactions[transactionID],
         },
@@ -735,7 +735,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
 
     // First, add data that will be used in all cases
     const optimisticChatReportData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
         value: {
             ...chatReport,
@@ -746,12 +746,12 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
         },
     };
     const optimisticIOUReportData = {
-        onyxMethod: CONST.ONYX.METHOD.SET,
+        onyxMethod: Onyx.METHOD.SET,
         key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticIOUReport.reportID}`,
         value: optimisticIOUReport,
     };
     const optimisticReportActionsData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
         value: {
             [optimisticIOUReportAction.reportActionID]: {
@@ -763,7 +763,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
@@ -775,7 +775,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
@@ -791,14 +791,14 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType
     if (isNewChat) {
         // Change the method to set for new reports because it doesn't exist yet, is faster,
         // and we need the data to be available when we navigate to the chat page
-        optimisticChatReportData.onyxMethod = CONST.ONYX.METHOD.SET;
-        optimisticReportActionsData.onyxMethod = CONST.ONYX.METHOD.SET;
-        optimisticIOUReportData.onyxMethod = CONST.ONYX.METHOD.SET;
+        optimisticChatReportData.onyxMethod = Onyx.METHOD.SET;
+        optimisticReportActionsData.onyxMethod = Onyx.METHOD.SET;
+        optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET;
 
         // Set and clear pending fields on the chat report
         optimisticChatReportData.value.pendingFields = {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
         successData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: optimisticChatReportData.key,
             value: {pendingFields: null},
         });
@@ -851,7 +851,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
             value: {
                 ...chatReport,
@@ -864,7 +864,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
@@ -874,7 +874,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
                 ...iouReport,
@@ -886,7 +886,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
@@ -895,7 +895,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
             value: {
                 iouReportID: null,
@@ -905,7 +905,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 627d2898166c..eebc433833ec 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -39,21 +39,21 @@ function openPaymentsPage() {
     const onyxData = {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
                 value: true,
             },
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
                 value: false,
             },
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
                 value: false,
             },
@@ -76,7 +76,7 @@ function openPaymentsPage() {
 function getMakeDefaultPaymentOnyxData(bankAccountID, fundID, previousPaymentMethod, currentPaymentMethod, isOptimisticData = true) {
     const onyxData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.USER_WALLET,
             value: {
                 walletLinkedAccountID: bankAccountID || fundID,
@@ -92,7 +92,7 @@ function getMakeDefaultPaymentOnyxData(bankAccountID, fundID, previousPaymentMet
 
     if (previousPaymentMethod) {
         onyxData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: previousPaymentMethod.accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT ? ONYXKEYS.BANK_ACCOUNT_LIST : ONYXKEYS.CARD_LIST,
             value: {
                 [previousPaymentMethod.methodID]: {
@@ -104,7 +104,7 @@ function getMakeDefaultPaymentOnyxData(bankAccountID, fundID, previousPaymentMet
 
     if (currentPaymentMethod) {
         onyxData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: currentPaymentMethod.accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT ? ONYXKEYS.BANK_ACCOUNT_LIST : ONYXKEYS.CARD_LIST,
             value: {
                 [currentPaymentMethod.methodID]: {
@@ -159,17 +159,17 @@ function addPaymentCard(params) {
         password: params.password,
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
             value: {isLoading: true},
         }],
         successData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
             value: {isLoading: false},
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
             value: {isLoading: false},
         }],
@@ -322,7 +322,7 @@ function deletePaymentCard(fundID) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.CARD_LIST}`,
                 value: {[fundID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
             },
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index 1816a8a752a8..afcf1d2e8d68 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -102,7 +102,7 @@ function getCountryISO(countryName) {
 function updatePronouns(pronouns) {
     API.write('UpdatePronouns', {pronouns}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -121,7 +121,7 @@ function updatePronouns(pronouns) {
 function updateDisplayName(firstName, lastName) {
     API.write('UpdateDisplayName', {firstName, lastName}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -145,7 +145,7 @@ function updateDisplayName(firstName, lastName) {
 function updateLegalName(legalFirstName, legalLastName) {
     API.write('UpdateLegalName', {legalFirstName, legalLastName}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
             value: {
                 legalFirstName,
@@ -162,7 +162,7 @@ function updateLegalName(legalFirstName, legalLastName) {
 function updateDateOfBirth(dob) {
     API.write('UpdateDateOfBirth', {dob}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
             value: {
                 dob,
@@ -197,7 +197,7 @@ function updateAddress(street, street2, city, state, zip, country) {
     }
     API.write('UpdateHomeAddress', parameters, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
             value: {
                 address: {
@@ -226,7 +226,7 @@ function updateAutomaticTimezone(timezone) {
         timezone: JSON.stringify(timezone),
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -251,7 +251,7 @@ function updateSelectedTimezone(selectedTimezone) {
         timezone: JSON.stringify(timezone),
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -284,7 +284,7 @@ function openPersonalDetailsPage() {
  */
 function updateAvatar(file) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.PERSONAL_DETAILS,
         value: {
             [currentUserEmail]: {
@@ -302,7 +302,7 @@ function updateAvatar(file) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.PERSONAL_DETAILS,
         value: {
             [currentUserEmail]: {
@@ -313,7 +313,7 @@ function updateAvatar(file) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.PERSONAL_DETAILS,
         value: {
             [currentUserEmail]: {
@@ -338,7 +338,7 @@ function deleteAvatar() {
 
     API.write('DeleteUserAvatar', {}, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
@@ -347,7 +347,7 @@ function deleteAvatar() {
             },
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {
                 [currentUserEmail]: {
diff --git a/src/libs/actions/Plaid.js b/src/libs/actions/Plaid.js
index 819192ca5f9d..3bc31ede868a 100644
--- a/src/libs/actions/Plaid.js
+++ b/src/libs/actions/Plaid.js
@@ -1,7 +1,7 @@
+import Onyx from 'react-native-onyx';
 import getPlaidLinkTokenParameters from '../getPlaidLinkTokenParameters';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
-import CONST from '../../CONST';
 import * as PlaidDataProps from '../../pages/ReimbursementAccount/plaidDataPropTypes';
 
 /**
@@ -14,15 +14,15 @@ function openPlaidBankLogin(allowDebit, bankAccountID) {
     params.allowDebit = allowDebit;
     params.bankAccountID = bankAccountID;
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.SET,
+        onyxMethod: Onyx.METHOD.SET,
         key: ONYXKEYS.PLAID_DATA,
         value: {...PlaidDataProps.plaidDataDefaultProps, isLoading: true},
     }, {
-        onyxMethod: CONST.ONYX.METHOD.SET,
+        onyxMethod: Onyx.METHOD.SET,
         key: ONYXKEYS.PLAID_LINK_TOKEN,
         value: '',
     }, {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
         value: {
             plaidAccountID: '',
@@ -44,7 +44,7 @@ function openPlaidBankAccountSelector(publicToken, bankName, allowDebit) {
         bank: bankName,
     }, {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PLAID_DATA,
             value: {
                 isLoading: true,
@@ -53,7 +53,7 @@ function openPlaidBankAccountSelector(publicToken, bankName, allowDebit) {
             },
         }],
         successData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PLAID_DATA,
             value: {
                 isLoading: false,
@@ -61,7 +61,7 @@ function openPlaidBankAccountSelector(publicToken, bankName, allowDebit) {
             },
         }],
         failureData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PLAID_DATA,
             value: {
                 isLoading: false,
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index b82e4a2427d5..1c8f7041be4c 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -78,7 +78,7 @@ function updateLastAccessedWorkspace(policyID) {
 function deleteWorkspace(policyID, reports, policyName) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
@@ -86,7 +86,7 @@ function deleteWorkspace(policyID, reports, policyName) {
             },
         },
         ..._.map(reports, ({reportID}) => ({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
@@ -106,7 +106,7 @@ function deleteWorkspace(policyID, reports, policyName) {
             const optimisticReportActions = {};
             optimisticReportActions[optimisticClosedReportAction.reportActionID] = optimisticClosedReportAction;
             return {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
                 value: optimisticReportActions,
             };
@@ -118,7 +118,7 @@ function deleteWorkspace(policyID, reports, policyName) {
         ..._.map(reports, ({
             reportID, stateNum, statusNum, hasDraft, oldPolicyName,
         }) => ({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 stateNum,
@@ -208,17 +208,17 @@ function removeMembers(members, policyID) {
     }
     const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`;
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: membersListKey,
         value: _.object(members, Array(members.length).fill({pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE})),
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: membersListKey,
         value: _.object(members, Array(members.length).fill(null)),
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: membersListKey,
         value: _.object(members, Array(members.length).fill({errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal('workspace.people.error.genericRemove')}})),
     }];
@@ -258,7 +258,7 @@ function createPolicyExpenseChats(policyID, members, betas) {
                 reportID: oldChat.reportID,
             };
             workspaceMembersChats.onyxOptimisticData.push({
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${oldChat.reportID}`,
                 value: {
                     stateNum: CONST.REPORT.STATE_NUM.OPEN,
@@ -282,7 +282,7 @@ function createPolicyExpenseChats(policyID, members, betas) {
         };
 
         workspaceMembersChats.onyxOptimisticData.push({
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
             value: {
                 ...optimisticReport,
@@ -293,13 +293,13 @@ function createPolicyExpenseChats(policyID, members, betas) {
             },
         });
         workspaceMembersChats.onyxOptimisticData.push({
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
             value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
         });
 
         workspaceMembersChats.onyxSuccessData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
             value: {
                 pendingFields: {
@@ -312,13 +312,13 @@ function createPolicyExpenseChats(policyID, members, betas) {
             },
         });
         workspaceMembersChats.onyxSuccessData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
             value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
         });
 
         workspaceMembersChats.onyxFailureData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
             value: {
                 isLoadingReportActions: false,
@@ -345,7 +345,7 @@ function addMembersToWorkspace(memberLogins, welcomeNote, policyID, betas) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: membersListKey,
 
             // Convert to object with each key containing {pendingAction: ‘add’}
@@ -356,7 +356,7 @@ function addMembersToWorkspace(memberLogins, welcomeNote, policyID, betas) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: membersListKey,
 
             // Convert to object with each key clearing pendingAction. We don’t
@@ -368,7 +368,7 @@ function addMembersToWorkspace(memberLogins, welcomeNote, policyID, betas) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: membersListKey,
 
             // Convert to object with each key containing the error. We don’t
@@ -400,7 +400,7 @@ function addMembersToWorkspace(memberLogins, welcomeNote, policyID, betas) {
  */
 function updateWorkspaceAvatar(policyID, file) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
         value: {
             avatar: file.uri,
@@ -413,7 +413,7 @@ function updateWorkspaceAvatar(policyID, file) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
         value: {
             pendingFields: {
@@ -422,7 +422,7 @@ function updateWorkspaceAvatar(policyID, file) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
         value: {
             avatar: allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`].avatar,
@@ -442,7 +442,7 @@ function updateWorkspaceAvatar(policyID, file) {
 function deleteWorkspaceAvatar(policyID) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -457,7 +457,7 @@ function deleteWorkspaceAvatar(policyID) {
     ];
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -468,7 +468,7 @@ function deleteWorkspaceAvatar(policyID) {
     ];
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -511,7 +511,7 @@ function clearAvatarErrors(policyID) {
 function updateGeneralSettings(policyID, name, currency) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -529,7 +529,7 @@ function updateGeneralSettings(policyID, name, currency) {
     ];
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -540,7 +540,7 @@ function updateGeneralSettings(policyID, name, currency) {
     ];
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 pendingFields: {
@@ -624,7 +624,7 @@ function hideWorkspaceAlertMessage(policyID) {
 function updateWorkspaceCustomUnit(policyID, currentCustomUnit, newCustomUnit, lastModified) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -639,7 +639,7 @@ function updateWorkspaceCustomUnit(policyID, currentCustomUnit, newCustomUnit, l
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -654,7 +654,7 @@ function updateWorkspaceCustomUnit(policyID, currentCustomUnit, newCustomUnit, l
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -685,7 +685,7 @@ function updateWorkspaceCustomUnit(policyID, currentCustomUnit, newCustomUnit, l
 function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, newCustomUnitRate, lastModified) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -705,7 +705,7 @@ function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, new
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -723,7 +723,7 @@ function updateCustomUnitRate(policyID, currentCustomUnitRate, customUnitID, new
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 customUnits: {
@@ -887,7 +887,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
     {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {
                     id: policyID,
@@ -900,7 +900,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`,
                 value: {
                     [sessionEmail]: {
@@ -910,7 +910,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
                 value: {
                     pendingFields: {
@@ -920,12 +920,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
                 value: announceReportActionData,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
                 value: {
                     pendingFields: {
@@ -935,12 +935,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
                 value: adminsReportActionData,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
                 value: {
                     pendingFields: {
@@ -950,19 +950,19 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
                 value: expenseReportActionData,
             },
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {pendingAction: null},
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
                 value: {
                     pendingFields: {
@@ -972,7 +972,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
                 value: {
                     [_.keys(announceChatData)[0]]: {
@@ -981,7 +981,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
                 value: {
                     pendingFields: {
@@ -991,7 +991,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
                 value: {
                     [_.keys(adminsChatData)[0]]: {
@@ -1000,7 +1000,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
                 value: {
                     pendingFields: {
@@ -1010,7 +1010,7 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
                 value: {
                     [_.keys(expenseChatData)[0]]: {
@@ -1021,37 +1021,37 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
                 value: null,
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
                 value: null,
             },
@@ -1079,7 +1079,7 @@ function openWorkspaceReimburseView(policyID) {
     const onyxData = {
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -1088,7 +1088,7 @@ function openWorkspaceReimburseView(policyID) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
@@ -1138,7 +1138,7 @@ function leaveRoom(reportID) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
@@ -1148,7 +1148,7 @@ function leaveRoom(reportID) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     stateNum: CONST.REPORT.STATE_NUM.OPEN,
diff --git a/src/libs/actions/PushNotification.js b/src/libs/actions/PushNotification.js
index 168b4fb9e169..f69511fc8795 100644
--- a/src/libs/actions/PushNotification.js
+++ b/src/libs/actions/PushNotification.js
@@ -1,5 +1,4 @@
 import Onyx from 'react-native-onyx';
-import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
 import * as Device from './Device';
@@ -21,14 +20,14 @@ function setPushNotificationOptInStatus(isOptingIn) {
             const commandName = isOptingIn ? 'OptInToPushNotifications' : 'OptOutOfPushNotifications';
             const optimisticData = [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: ONYXKEYS.PUSH_NOTIFICATIONS_ENABLED,
                     value: isOptingIn,
                 },
             ];
             const failureData = [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: ONYXKEYS.PUSH_NOTIFICATIONS_ENABLED,
                     value: isUserOptedInToPushNotifications,
                 },
diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
index ae7f26a9bfcd..c9099c4916c9 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
@@ -1,3 +1,4 @@
+import Onyx from 'react-native-onyx';
 import CONST from '../../../CONST';
 import ONYXKEYS from '../../../ONYXKEYS';
 import * as store from './store';
@@ -25,7 +26,7 @@ function resetFreePlanBankAccount(bankAccountID) {
         {
             optimisticData: [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                     value: {
                         shouldShowResetModal: false,
@@ -36,34 +37,34 @@ function resetFreePlanBankAccount(bankAccountID) {
             ],
             successData: [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.SET,
+                    onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.ONFIDO_TOKEN,
                     value: '',
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.SET,
+                    onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.PLAID_DATA,
                     value: PlaidDataProps.plaidDataDefaultProps,
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.SET,
+                    onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.PLAID_LINK_TOKEN,
                     value: '',
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.SET,
+                    onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                     value: ReimbursementAccountProps.reimbursementAccountDefaultProps,
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.SET,
+                    onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
                     value: {},
                 },
             ],
             failureData: [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                     value: {isLoading: false, pendingAction: null},
                 },
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 6991ae7f316d..f4c8a42b47fd 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -230,12 +230,12 @@ function addActions(reportID, text = '', file) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: optimisticReport,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: optimisticReportActions,
         },
@@ -243,7 +243,7 @@ function addActions(reportID, text = '', file) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: _.mapObject(optimisticReportActions, () => ({pendingAction: null})),
         },
@@ -251,7 +251,7 @@ function addActions(reportID, text = '', file) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: _.mapObject(optimisticReportActions, action => ({...action, errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal('report.genericAddCommentFailureMessage')}})),
         },
@@ -262,7 +262,7 @@ function addActions(reportID, text = '', file) {
         const timezone = DateUtils.getCurrentTimezone();
         parameters.timezone = JSON.stringify(timezone);
         optimisticData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS,
             value: {[currentUserEmail]: {timezone}},
         });
@@ -314,7 +314,7 @@ function addComment(reportID, text) {
  */
 function openReport(reportID, participantList = [], newReportObject = {}) {
     const optimisticReportData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
         value: {
             isLoadingReportActions: true,
@@ -324,7 +324,7 @@ function openReport(reportID, participantList = [], newReportObject = {}) {
         },
     };
     const reportSuccessData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
         value: {
             isLoadingReportActions: false,
@@ -338,7 +338,7 @@ function openReport(reportID, participantList = [], newReportObject = {}) {
         },
     };
     const reportFailureData = {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
         value: {
             isLoadingReportActions: false,
@@ -360,7 +360,7 @@ function openReport(reportID, participantList = [], newReportObject = {}) {
     if (!_.isEmpty(newReportObject)) {
         // Change the method to set for new reports because it doesn't exist yet, is faster,
         // and we need the data to be available when we navigate to the chat page
-        optimisticReportData.onyxMethod = CONST.ONYX.METHOD.SET;
+        optimisticReportData.onyxMethod = Onyx.METHOD.SET;
         optimisticReportData.value = {
             ...optimisticReportData.value,
             ...newReportObject,
@@ -372,12 +372,12 @@ function openReport(reportID, participantList = [], newReportObject = {}) {
 
         const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(newReportObject.ownerEmail);
         onyxData.optimisticData.push({
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
         });
         onyxData.successData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
         });
@@ -420,7 +420,7 @@ function reconnect(reportID) {
         },
         {
             optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingReportActions: true,
@@ -429,14 +429,14 @@ function reconnect(reportID) {
                 },
             }],
             successData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingReportActions: false,
                 },
             }],
             failureData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingReportActions: false,
@@ -460,21 +460,21 @@ function readOldestAction(reportID, reportActionID) {
         },
         {
             optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingMoreReportActions: true,
                 },
             }],
             successData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingMoreReportActions: false,
                 },
             }],
             failureData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     isLoadingMoreReportActions: false,
@@ -496,7 +496,7 @@ function openPaymentDetailsPage(chatReportID, iouReportID) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: true,
@@ -505,7 +505,7 @@ function openPaymentDetailsPage(chatReportID, iouReportID) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: false,
@@ -514,7 +514,7 @@ function openPaymentDetailsPage(chatReportID, iouReportID) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: false,
@@ -537,7 +537,7 @@ function openMoneyRequestsReportPage(chatReportID, linkedReportID) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: true,
@@ -546,7 +546,7 @@ function openMoneyRequestsReportPage(chatReportID, linkedReportID) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: false,
@@ -555,7 +555,7 @@ function openMoneyRequestsReportPage(chatReportID, linkedReportID) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.IOU,
                 value: {
                     loading: false,
@@ -577,7 +577,7 @@ function readNewestAction(reportID) {
         },
         {
             optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     lastReadTime: DateUtils.getDBTime(),
@@ -604,7 +604,7 @@ function markCommentAsUnread(reportID, reportActionCreated) {
         },
         {
             optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
                 value: {
                     lastReadTime,
@@ -624,7 +624,7 @@ function togglePinnedState(report) {
     // Optimistically pin/unpin the report before we send out the command
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
             value: {isPinned: pinnedValue},
         },
@@ -751,7 +751,7 @@ function deleteReportComment(reportID, reportAction) {
     // and and remove the pendingAction so the strike-through clears
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -765,7 +765,7 @@ function deleteReportComment(reportID, reportAction) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -778,12 +778,12 @@ function deleteReportComment(reportID, reportAction) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: optimisticReportActions,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: optimisticReport,
         },
@@ -913,7 +913,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: optimisticReportActions,
         },
@@ -927,7 +927,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
             lastMessageText: Str.htmlDecode(lastMessageText),
         };
         optimisticData.push({
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: optimisticReport,
         });
@@ -935,7 +935,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -948,7 +948,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
@@ -995,14 +995,14 @@ function saveReportActionDraftNumberOfLines(reportID, reportActionID, numberOfLi
 function updateNotificationPreference(reportID, previousValue, newValue) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {notificationPreference: newValue},
         },
     ];
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {notificationPreference: previousValue},
         },
@@ -1053,7 +1053,7 @@ function addPolicyReport(policy, reportName, visibility) {
     // Therefore, Onyx.set is used instead of Onyx.merge.
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
             value: {
                 pendingFields: {
@@ -1063,14 +1063,14 @@ function addPolicyReport(policy, reportName, visibility) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
             value: {[createdReportAction.reportActionID]: createdReportAction},
         },
     ];
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
             value: {
                 pendingFields: {
@@ -1079,7 +1079,7 @@ function addPolicyReport(policy, reportName, visibility) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
             value: {
                 [createdReportAction.reportActionID]: {
@@ -1123,7 +1123,7 @@ function updatePolicyRoomName(policyRoomReport, policyRoomName) {
     const previousName = policyRoomReport.reportName;
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 reportName: policyRoomName,
@@ -1139,7 +1139,7 @@ function updatePolicyRoomName(policyRoomReport, policyRoomName) {
     const successData = [
         {
 
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 pendingFields: {
@@ -1151,7 +1151,7 @@ function updatePolicyRoomName(policyRoomReport, policyRoomName) {
     const failureData = [
         {
 
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 reportName: previousName,
@@ -1285,7 +1285,7 @@ function getOptimisticDataForReportActionUpdate(originalReportAction, message, r
 
     return [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportActionID]: {
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index ef3f7cddb987..aae89ff407af 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -79,7 +79,7 @@ function signOutAndRedirectToSignIn() {
  */
 function resendValidationLink(login = credentials.login) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: true,
@@ -88,7 +88,7 @@ function resendValidationLink(login = credentials.login) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -96,7 +96,7 @@ function resendValidationLink(login = credentials.login) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -114,7 +114,7 @@ function resendValidationLink(login = credentials.login) {
  */
 function resendValidateCode(login = credentials.login) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: true,
@@ -123,7 +123,7 @@ function resendValidateCode(login = credentials.login) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -131,7 +131,7 @@ function resendValidateCode(login = credentials.login) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -148,7 +148,7 @@ function resendValidateCode(login = credentials.login) {
  */
 function resendLinkWithValidateCode(login = credentials.login) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: true,
@@ -156,7 +156,7 @@ function resendLinkWithValidateCode(login = credentials.login) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -164,7 +164,7 @@ function resendLinkWithValidateCode(login = credentials.login) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -182,7 +182,7 @@ function resendLinkWithValidateCode(login = credentials.login) {
 function beginSignIn(login) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
@@ -193,14 +193,14 @@ function beginSignIn(login) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.CREDENTIALS,
             value: {
                 validateCode: null,
@@ -210,7 +210,7 @@ function beginSignIn(login) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -234,7 +234,7 @@ function beginSignIn(login) {
 function signInWithShortLivedAuthToken(email, authToken) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
@@ -242,7 +242,7 @@ function signInWithShortLivedAuthToken(email, authToken) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.IS_TOKEN_VALID,
             value: true,
         },
@@ -250,7 +250,7 @@ function signInWithShortLivedAuthToken(email, authToken) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -260,14 +260,14 @@ function signInWithShortLivedAuthToken(email, authToken) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.IS_TOKEN_VALID,
             value: false,
         },
@@ -304,7 +304,7 @@ function signInWithShortLivedAuthToken(email, authToken) {
 function signIn(password, validateCode, twoFactorAuthCode, preferredLocale = CONST.LOCALES.DEFAULT) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
@@ -315,7 +315,7 @@ function signIn(password, validateCode, twoFactorAuthCode, preferredLocale = CON
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -325,7 +325,7 @@ function signIn(password, validateCode, twoFactorAuthCode, preferredLocale = CON
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -352,7 +352,7 @@ function signInWithValidateCode(accountID, code, twoFactorAuthCode) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 ...CONST.DEFAULT_ACCOUNT_DATA,
@@ -360,7 +360,7 @@ function signInWithValidateCode(accountID, code, twoFactorAuthCode) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {autoAuthState: CONST.AUTO_AUTH_STATE.SIGNING_IN},
         },
@@ -368,12 +368,12 @@ function signInWithValidateCode(accountID, code, twoFactorAuthCode) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {isLoading: false},
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.CREDENTIALS,
             value: {
                 accountID,
@@ -381,7 +381,7 @@ function signInWithValidateCode(accountID, code, twoFactorAuthCode) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {autoAuthState: CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN},
         },
@@ -389,12 +389,12 @@ function signInWithValidateCode(accountID, code, twoFactorAuthCode) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {isLoading: false},
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {autoAuthState: CONST.AUTO_AUTH_STATE.FAILED},
         },
@@ -442,7 +442,7 @@ function resetPassword() {
     {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     errors: null,
@@ -461,7 +461,7 @@ function resendResetPassword() {
     {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: true,
@@ -473,7 +473,7 @@ function resendResetPassword() {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
@@ -483,7 +483,7 @@ function resendResetPassword() {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
@@ -539,7 +539,7 @@ function clearAccountMessages() {
 function updatePasswordAndSignin(accountID, validateCode, password) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: true,
@@ -547,7 +547,7 @@ function updatePasswordAndSignin(accountID, validateCode, password) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {
                 errors: null,
@@ -557,7 +557,7 @@ function updatePasswordAndSignin(accountID, validateCode, password) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -565,7 +565,7 @@ function updatePasswordAndSignin(accountID, validateCode, password) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {
                 errors: null,
@@ -575,7 +575,7 @@ function updatePasswordAndSignin(accountID, validateCode, password) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index da92358e5162..80ab933c46da 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -42,21 +42,21 @@ function updatePassword(oldPassword, password) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true},
             },
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {isLoading: false},
             },
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {isLoading: false},
             },
@@ -75,14 +75,14 @@ function closeAccount(message) {
     API.write('CloseAccount', {message}, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM,
                 value: {isLoading: true},
             },
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM,
                 value: {isLoading: false},
             },
@@ -107,7 +107,7 @@ function resendValidateCode(login) {
  */
 function requestContactMethodValidateCode(contactMethod) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -122,7 +122,7 @@ function requestContactMethodValidateCode(contactMethod) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -134,7 +134,7 @@ function requestContactMethodValidateCode(contactMethod) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -167,14 +167,14 @@ function updateNewsletterSubscription(isSubscribed) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.USER,
                 value: {isSubscribedToNewsletter: isSubscribed},
             },
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.USER,
                 value: {isSubscribedToNewsletter: !isSubscribed},
             },
@@ -199,7 +199,7 @@ function deleteContactMethod(contactMethod, loginList) {
     }
 
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -214,14 +214,14 @@ function deleteContactMethod(contactMethod, loginList) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: null,
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -271,7 +271,7 @@ function clearContactMethodErrors(contactMethod, fieldName) {
  */
 function addNewContactMethodAndNavigate(contactMethod, password) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -287,7 +287,7 @@ function addNewContactMethodAndNavigate(contactMethod, password) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -298,7 +298,7 @@ function addNewContactMethodAndNavigate(contactMethod, password) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -329,7 +329,7 @@ function validateLogin(accountID, validateCode) {
 
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
             value: {
                 isLoading: false,
@@ -351,7 +351,7 @@ function validateLogin(accountID, validateCode) {
  */
 function validateSecondaryLogin(contactMethod, validateCode) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -365,7 +365,7 @@ function validateSecondaryLogin(contactMethod, validateCode) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -376,7 +376,7 @@ function validateSecondaryLogin(contactMethod, validateCode) {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.LOGIN_LIST,
         value: {
             [contactMethod]: {
@@ -425,12 +425,12 @@ function isBlockedFromConcierge(blockedFromConciergeNVP) {
 function addPaypalMeAddress(address) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS,
             value: address,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PAYPAL,
             value: {
                 title: 'PayPal.me',
@@ -457,7 +457,7 @@ function addPaypalMeAddress(address) {
 function deletePaypalMeAddress() {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PAYPAL,
             value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
         },
@@ -466,12 +466,12 @@ function deletePaypalMeAddress() {
     // Success data required for Android, more info here https://github.com/Expensify/App/pull/17903#discussion_r1175763081
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS,
             value: '',
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.PAYPAL,
             value: {},
         },
@@ -582,7 +582,7 @@ function subscribeToExpensifyCardUpdates() {
 function updatePreferredSkinTone(skinTone) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
             value: skinTone,
         },
@@ -599,7 +599,7 @@ function updatePreferredSkinTone(skinTone) {
 function updateFrequentlyUsedEmojis(frequentlyUsedEmojis) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.SET,
+            onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.FREQUENTLY_USED_EMOJIS,
             value: frequentlyUsedEmojis,
         },
@@ -616,7 +616,7 @@ function updateFrequentlyUsedEmojis(frequentlyUsedEmojis) {
 function updateChatPriorityMode(mode) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_PRIORITY_MODE,
             value: mode,
         },
@@ -663,7 +663,7 @@ function generateStatementPDF(period) {
     API.read('GetStatementPDF', {period}, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_STATEMENT,
                 value: {
                     isGenerating: true,
@@ -672,7 +672,7 @@ function generateStatementPDF(period) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_STATEMENT,
                 value: {
                     isGenerating: false,
@@ -681,7 +681,7 @@ function generateStatementPDF(period) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_STATEMENT,
                 value: {
                     isGenerating: false,
diff --git a/src/libs/actions/Wallet.js b/src/libs/actions/Wallet.js
index 5efc987a8c2d..e982fec87043 100644
--- a/src/libs/actions/Wallet.js
+++ b/src/libs/actions/Wallet.js
@@ -1,6 +1,5 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
-import CONST from '../../CONST';
 import * as API from '../API';
 
 /**
@@ -14,7 +13,7 @@ function openOnfidoFlow() {
         optimisticData: [
             {
                 // Use Onyx.set() since we are resetting the Onfido flow completely.
-                onyxMethod: CONST.ONYX.METHOD.SET,
+                onyxMethod: Onyx.METHOD.SET,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: true,
@@ -23,7 +22,7 @@ function openOnfidoFlow() {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: false,
@@ -32,7 +31,7 @@ function openOnfidoFlow() {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: false,
@@ -105,7 +104,7 @@ function updatePersonalDetails(personalDetails) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: true,
@@ -116,7 +115,7 @@ function updatePersonalDetails(personalDetails) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: false,
@@ -125,7 +124,7 @@ function updatePersonalDetails(personalDetails) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: false,
@@ -152,7 +151,7 @@ function verifyIdentity(parameters) {
     }, {
         optimisticData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: true,
@@ -161,7 +160,7 @@ function verifyIdentity(parameters) {
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.USER_WALLET,
                 value: {
                     shouldShowFailedKYC: false,
@@ -170,7 +169,7 @@ function verifyIdentity(parameters) {
         ],
         successData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: false,
@@ -180,7 +179,7 @@ function verifyIdentity(parameters) {
         ],
         failureData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ONFIDO,
                 value: {
                     isLoading: false,
@@ -201,7 +200,7 @@ function verifyIdentity(parameters) {
 function acceptWalletTerms(parameters) {
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.USER_WALLET,
             value: {
                 shouldShowWalletActivationSuccess: true,
@@ -211,7 +210,7 @@ function acceptWalletTerms(parameters) {
 
     const successData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.WALLET_TERMS,
             value: {
                 errors: null,
@@ -221,7 +220,7 @@ function acceptWalletTerms(parameters) {
 
     const failureData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.USER_WALLET,
             value: {
                 shouldShowWalletActivationSuccess: null,
@@ -279,21 +278,21 @@ function answerQuestionsForWallet(answers, idNumber) {
         },
         {
             optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: true,
                 },
             }],
             successData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: false,
                 },
             }],
             failureData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
                 value: {
                     isLoading: false,
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
index b7379e3c6b42..83557aa63559 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.js
@@ -109,7 +109,7 @@ describe('actions/Report', () => {
                 const channel = Pusher.getChannel(`${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`);
                 channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
                         value: {
                             reportID: REPORT_ID,
@@ -120,7 +120,7 @@ describe('actions/Report', () => {
                         },
                     },
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
                         value: {
                             [reportActionID]: {pendingAction: null},
@@ -239,7 +239,7 @@ describe('actions/Report', () => {
                 reportActionCreatedDate = DateUtils.getDBTime();
                 channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
                         value: {
                             reportID: REPORT_ID,
@@ -252,7 +252,7 @@ describe('actions/Report', () => {
                         },
                     },
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
                         value: {
                             1: {
@@ -354,7 +354,7 @@ describe('actions/Report', () => {
 
                 jest.advanceTimersByTime(10);
                 const optimisticReportActions = {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
                     value: {
                         200: {
@@ -384,7 +384,7 @@ describe('actions/Report', () => {
                 // When we emit the events for these pending created actions to update them to not pending
                 channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
                         value: {
                             reportID: REPORT_ID,
@@ -525,7 +525,7 @@ describe('actions/Report', () => {
                 const channel = Pusher.getChannel(`${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}${TEST_USER_ACCOUNT_ID}${CONFIG.PUSHER.SUFFIX}`);
                 channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [
                     {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
+                        onyxMethod: Onyx.METHOD.MERGE,
                         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
                         value: {
                             1: REPORT_ACTION,
diff --git a/tests/ui/UnreadIndicatorsTest.js b/tests/ui/UnreadIndicatorsTest.js
index ad2d622a4315..549a59d7e30d 100644
--- a/tests/ui/UnreadIndicatorsTest.js
+++ b/tests/ui/UnreadIndicatorsTest.js
@@ -297,7 +297,7 @@ describe('Unread Indicators', () => {
             const channel = Pusher.getChannel(`${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}${USER_A_ACCOUNT_ID}${CONFIG.PUSHER.SUFFIX}`);
             channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT}${NEW_REPORT_ID}`,
                     value: {
                         reportID: NEW_REPORT_ID,
@@ -309,7 +309,7 @@ describe('Unread Indicators', () => {
                     },
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${NEW_REPORT_ID}`,
                     value: {
                         [createdReportActionID]: {
@@ -331,7 +331,7 @@ describe('Unread Indicators', () => {
                     shouldNotify: true,
                 },
                 {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    onyxMethod: Onyx.METHOD.MERGE,
                     key: ONYXKEYS.PERSONAL_DETAILS,
                     value: {
                         [USER_C_EMAIL]: TestHelper.buildPersonalDetails(USER_C_EMAIL, USER_C_ACCOUNT_ID, 'C'),
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index c45e9096f55b..f609d70a91d1 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -46,21 +46,21 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
     HttpUtils.xhr.mockResolvedValue({
         onyxData: [
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.CREDENTIALS,
                 value: {
                     login,
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     validated: true,
                 },
             },
             {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.PERSONAL_DETAILS,
                 value: {
                     [login]: buildPersonalDetails(login, accountID, firstName),
@@ -79,7 +79,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                 .mockResolvedValue({
                     onyxData: [
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.SESSION,
                             value: {
                                 authToken,
@@ -89,7 +89,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                             },
                         },
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.CREDENTIALS,
                             value: {
                                 autoGeneratedLogin: Str.guid('expensify.cash-'),
@@ -97,19 +97,19 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                             },
                         },
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.USER,
                             value: {
                                 isUsingExpensifyCard: false,
                             },
                         },
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.BETAS,
                             value: ['all'],
                         },
                         {
-                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            onyxMethod: Onyx.METHOD.MERGE,
                             key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
                             value: 'randomID',
                         },
