diff --git a/.gitignore b/.gitignore
index 00c704e472..56d032e167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,8 @@ robot/Cumulus/results/
 datasets/dev_org/test_data.db
 *.db
 .cci
-
+.sfdx
+.sf
 # LWC
 force-app/main/default/lwc/.eslintrc.json
 /node_modules
diff --git a/force-app/main/default/labels/CustomLabels.labels-meta.xml b/force-app/main/default/labels/CustomLabels.labels-meta.xml
index c7b82c65a9..3f57f0b6b4 100644
--- a/force-app/main/default/labels/CustomLabels.labels-meta.xml
+++ b/force-app/main/default/labels/CustomLabels.labels-meta.xml
@@ -5844,6 +5844,13 @@ To check your GAU Allocation settings, go to Donations | GAU Allocations.</value
         <shortDescription>Button to process a batch and payments through {0}</shortDescription>
         <value>Process Batch &amp; Payments</value>
     </labels>
+    <labels>
+        <fullName>bgeEditPaymentInformation</fullName>
+        <language>en_US</language>
+        <protected>true</protected>
+        <shortDescription>Warns users to re-enter payment information when editing Elevate-connected gifts</shortDescription>
+        <value>You can&apos;t edit this Elevate-connected gift until you re-enter the payment information. Select Edit Payment Information.</value>
+    </labels>
     <labels>
         <fullName>bgeRetirementWarningBody</fullName>
         <categories>Batch Data Entry</categories>
@@ -9810,14 +9817,6 @@ If preferred, you can disable Gift Entry and instead use older Batch Gift Entry
         <shortDescription>Warning about processing batch when authorizations have expired</shortDescription>
         <value>One or more card authorizations expired. To ensure these payments are charged when processing the batch, reenter the payment information for donations with an Elevate Payment Status of Expired Authorization.</value>
     </labels>
-    <labels>
-        <fullName>gePaymentProcessedWarning</fullName>
-        <categories>Gift Entry</categories>
-        <language>en_US</language>
-        <protected>true</protected>
-        <shortDescription>Warning about editing fields when transaction already processed</shortDescription>
-        <value>{0} successfully processed the payment. Changing the donor, date, amount, or payment method will result in inconsistent records for the same transaction in {0} and NPSP.</value>
-    </labels>
     <labels>
         <fullName>gePaymentProcessError</fullName>
         <categories>Gift Entry</categories>
diff --git a/force-app/main/default/lwc/geElevateBatch/geElevateBatch.js b/force-app/main/default/lwc/geElevateBatch/geElevateBatch.js
index 22b3fd2965..171aec18ea 100644
--- a/force-app/main/default/lwc/geElevateBatch/geElevateBatch.js
+++ b/force-app/main/default/lwc/geElevateBatch/geElevateBatch.js
@@ -1,10 +1,7 @@
 import apexAddToElevateBatch from '@salesforce/apex/GE_GiftEntryController.addToElevateBatch';
 import apexCreateElevateBatch from '@salesforce/apex/GE_GiftEntryController.createElevateBatch';
 import apexRemoveFromElevateBatch from '@salesforce/apex/GE_GiftEntryController.removeFromElevateBatch';
-import PAYMENT_ELEVATE_ID from '@salesforce/schema/DataImport__c.Payment_Elevate_ID__c';
-import RECURRING_DONATION_ID from '@salesforce/schema/DataImport__c.Recurring_Donation_Elevate_Recurring_ID__c';
 import PAYMENT_ELEVATE_ELEVATE_BATCH_ID from '@salesforce/schema/DataImport__c.Payment_Elevate_Batch_Id__c';
-import GeGatewaySettings from 'c/geGatewaySettings';
 
 class ElevateBatch {
 
@@ -43,9 +40,8 @@ class ElevateBatch {
     async remove(batchItem) {
         return await apexRemoveFromElevateBatch({
             batchItem: {
-                elevateBatchId: batchItem[PAYMENT_ELEVATE_ELEVATE_BATCH_ID.fieldApiName],
-                id: batchItem[PAYMENT_ELEVATE_ID.fieldApiName] ? batchItem[PAYMENT_ELEVATE_ID.fieldApiName] :
-                    batchItem[RECURRING_DONATION_ID.fieldApiName]
+                elevateBatchId: batchItem.getFieldValue(PAYMENT_ELEVATE_ELEVATE_BATCH_ID.fieldApiName),
+                id: batchItem.idToRemove()
             }
         });
     }
diff --git a/force-app/main/default/lwc/geFormRenderer/__tests__/geFormRenderer.test.js b/force-app/main/default/lwc/geFormRenderer/__tests__/geFormRenderer.test.js
index c529d46a82..fe5ad32bb7 100644
--- a/force-app/main/default/lwc/geFormRenderer/__tests__/geFormRenderer.test.js
+++ b/force-app/main/default/lwc/geFormRenderer/__tests__/geFormRenderer.test.js
@@ -16,6 +16,7 @@ import { mockCheckComboboxValidity } from 'lightning/combobox';
 import { mockGetIframeReply } from 'c/psElevateTokenHandler';
 
 import donationImported from '@salesforce/schema/DataImport__c.DonationImported__c';
+import { DEFAULT_FORM_FIELDS } from '../../utilTemplateBuilder/utilTemplateBuilder';
 
 const mockWrapperWithNoNames = require('../../../../../../tests/__mocks__/apex/data/retrieveDefaultSGERenderWrapper.json');
 const getRecordContact1Imported = require('./data/getRecordContact1Imported.json');
@@ -47,10 +48,38 @@ describe('c-ge-form-renderer', () => {
                 return config.recordId === DUMMY_BATCH_ID;
             });
 
+            await flushPromises();
+                                
+            const button = element.shadowRoot.querySelectorAll('[data-id="recurringButton"]');
+            expect(button).toHaveLength(1);
+        });
+        
+        it('make recurring button is disabled when imported gift is loaded into the form', async() => {
+            retrieveDefaultSGERenderWrapper.mockResolvedValue(mockWrapperWithNoNames);
+            getAllocationsSettings.mockResolvedValue(allocationsSettingsNoDefaultGAU);
+            const element = createElement('c-ge-form-renderer', {is: GeFormRenderer });
+
+            const DUMMY_BATCH_ID = 'a0T11000007F8WQEA0';
+
+            element.batchId = DUMMY_BATCH_ID;
+            document.body.appendChild(element);
+            await flushPromises();
+
+            // simulate getting back data for DUMMY_CONTACT_ID
+            getRecord.emit(dataImportBatchRecord, config => {
+                return config.recordId === DUMMY_BATCH_ID;
+            });
+
             await flushPromises();
 
             const button = element.shadowRoot.querySelectorAll('[data-id="recurringButton"]');
             expect(button).toHaveLength(1);
+
+            element.isMakeRecurringButtonDisabled = true;
+            await flushPromises();
+
+            const disabledButton = element.shadowRoot.querySelectorAll('[data-id="recurringButton"]');
+            expect(disabledButton[0].disabled).toBe(true);
         });
 
         it('when a form is saved with a possible validation rule error then processing of the donation should be halted',
@@ -187,39 +216,6 @@ describe('c-ge-form-renderer', () => {
             expect(componentName).toBe('geModalRecurringDonation');
         });
 
-        it('dispatches an event to display a warning modal when adding schedule for gift matched to existing opportunity', async () => {
-            retrieveDefaultSGERenderWrapper.mockResolvedValue(mockWrapperWithNoNames);
-            getAllocationsSettings.mockResolvedValue(allocationsSettingsNoDefaultGAU);
-            const element = createElement('c-ge-form-renderer', {is: GeFormRenderer });
-            const DUMMY_BATCH_ID = 'a0T11000007F8WQEA0';
-
-            element.batchId = DUMMY_BATCH_ID;
-
-            document.body.appendChild(element);
-
-            await flushPromises();
-
-            // simulate getting back data for DUMMY_CONTACT_ID
-            getRecord.emit(dataImportBatchRecord, config => {
-                return config.recordId === DUMMY_BATCH_ID;
-            });
-            element.giftInView = {
-                fields: { [donationImported.fieldApiName]: 'dummy_opportunity_id' }
-            };
-
-            await flushPromises();
-
-            const dispatchEventSpy = jest.spyOn(element, 'dispatchEvent');
-            const button = element.shadowRoot.querySelector('[data-id="recurringButton"]');
-            button.click();
-
-            await flushPromises();
-
-            expect(dispatchEventSpy).toHaveBeenCalledTimes(1);
-            const componentName = dispatchEventSpy.mock.calls[0][0].detail.modalProperties.componentName;
-            expect(componentName).toBe('geModalPrompt');
-        });
-
         it('dispatches an event to display a warning modal when adding schedule for gift with net new soft credits', async () => {
             retrieveDefaultSGERenderWrapper.mockResolvedValue(mockWrapperWithNoNames);
             getAllocationsSettings.mockResolvedValue(allocationsSettingsNoDefaultGAU);
@@ -256,43 +252,6 @@ describe('c-ge-form-renderer', () => {
             const componentName = dispatchEventSpy.mock.calls[0][0].detail.modalProperties.componentName;
             expect(componentName).toBe('geModalPrompt');
         });
-
-        it('dispatches an event to display a warning modal when adding schedule for gift with elevate authorization', async () => {
-            retrieveDefaultSGERenderWrapper.mockResolvedValue(mockWrapperWithNoNames);
-            getAllocationsSettings.mockResolvedValue(allocationsSettingsNoDefaultGAU);
-            const element = createElement('c-ge-form-renderer', {is: GeFormRenderer });
-            const DUMMY_BATCH_ID = 'a0T11000007F8WQEA0';
-
-            element.batchId = DUMMY_BATCH_ID;
-
-            document.body.appendChild(element);
-
-            await flushPromises();
-
-            // simulate getting back data for DUMMY_CONTACT_ID
-            getRecord.emit(dataImportBatchRecord, config => {
-                return config.recordId === DUMMY_BATCH_ID;
-            });
-            element.giftInView = {
-                fields: {
-                    'Payment_Method__c': 'Credit Card',
-                    'Donation_Amount__c': '0.01',
-                    'Payment_Status__c': 'AUTHORIZED'
-                }
-            };
-
-            await flushPromises();
-
-            const dispatchEventSpy = jest.spyOn(element, 'dispatchEvent');
-            const button = element.shadowRoot.querySelector('[data-id="recurringButton"]');
-            button.click();
-
-            await flushPromises();
-
-            expect(dispatchEventSpy).toHaveBeenCalledTimes(1);
-            const componentName = dispatchEventSpy.mock.calls[0][0].detail.modalProperties.componentName;
-            expect(componentName).toBe('geModalPrompt');
-        });
     });
 
     it('loads a template with four sections', async () => {
diff --git a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
index 18991aabe3..ae5d16e12b 100644
--- a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
+++ b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.html
@@ -114,19 +114,6 @@
                             </c-util-illustration>
                         </div>
                     </template>
-                    <template if:true={showElevateTransactionWarning}>
-                        <div class="slds-notify slds-notify_alert payment-warn" role="alert">
-                            <span class="slds-assistive-text">{CUSTOM_LABELS.commonWarning}</span>
-                            <span class="slds-icon_container slds-icon-utility-warning slds-m-right_x-small">
-                                    <lightning-icon
-                                            variant="warning"
-                                            icon-name="utility:warning"
-                                            size="small">
-                                    </lightning-icon>
-                                </span>
-                            <div class="slds-text-heading_small">{elevateTransactionWarning}</div>
-                        </div>
-                    </template>
                     <template if:true={isSingleGiftEntry}>
                         <template if:false={isPermissionError}
                                   for:each={sections}
@@ -169,20 +156,36 @@
                         </lightning-layout>
                     </template>
                     <template if:false={isSingleGiftEntry}>
-                        <template if:false={hasSchedule}>
-                            <lightning-layout horizontal-align="end">
-                                <lightning-layout-item>
+                        <lightning-layout>
+                            <lightning-layout-item size="10">
+                                <template if:true={shouldShowElevateTransactionWarning}>
+                                    <div class="slds-notify slds-notify_alert payment-warn" role="alert">
+                                        <span class="slds-assistive-text">{CUSTOM_LABELS.commonWarning}</span>
+                                        <span class="slds-icon_container slds-icon-utility-warning slds-m-right_x-small">
+                                            <lightning-icon
+                                                    variant="warning"
+                                                    icon-name="utility:warning"
+                                                    size="small">
+                                            </lightning-icon>
+                                        </span>
+                                        <div class="slds-text-heading_small" data-id="elevateTrnxWarning">{elevateTransactionWarning}</div>
+                                    </div>
+                                </template>
+                            </lightning-layout-item>
+                            <lightning-layout-item class="slds-text-align_right" size="2">
+                                <template if:false={hasSchedule}>
                                     <lightning-button
                                         if:true={isRecurringGiftsEnabled}
                                         icon-name="utility:refresh"
                                         label={CUSTOM_LABELS.geMakeRecurring}
                                         data-id='recurringButton'
                                         onclick={handleMakeGiftRecurring}
+                                        disabled={isMakeRecurringButtonDisabled}
                                         >
                                     </lightning-button>
-                                </lightning-layout-item>
-                            </lightning-layout>
-                        </template>
+                                </template>
+                            </lightning-layout-item>
+                        </lightning-layout>
                         <c-util-expandable-section class='slds-card slds-card_extension slds-m-bottom_large'
                                                    id={expandableContainerId}
                                                    is-collapsed={isFormCollapsed}
@@ -243,7 +246,8 @@
                                                           onclick={handleSave}
                                                           class='slds-m-left_x-small'
                                                           disabled={isUpdateActionDisabled}
-                                                          data-qa-locator={qaLocatorSaveButton}>
+                                                          data-qa-locator={qaLocatorSaveButton}
+                                                          data-id="formSaveButton">
                                         </lightning-button>
                                     </div>
                                 </lightning-layout-item>
diff --git a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.js b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.js
index b43603436f..48e8fdbef5 100644
--- a/force-app/main/default/lwc/geFormRenderer/geFormRenderer.js
+++ b/force-app/main/default/lwc/geFormRenderer/geFormRenderer.js
@@ -127,7 +127,8 @@ import {
     FAILED, ACH_CONSENT_TYPE,
     COMMITMENT_INACTIVE_STATUS,
     BATCH_COMMITMENT_CREATED_STATUS_REASON,
-    PAYMENT_METHOD_ACH
+    PAYMENT_METHOD_ACH,
+    GIFT_STATUSES
 } from 'c/geConstants';
 
 
@@ -190,6 +191,8 @@ export default class GeFormRenderer extends LightningElement{
     @api batchCurrencyIsoCode;
     @api isElevateCustomer = false;
     @api saveDisabled = false;
+    @api isMakeRecurringButtonDisabled = false;
+    _isElevateWidgetInDisabledState = false;
 
     @track isPermissionError = false;
     @track permissionErrorTitle;
@@ -201,7 +204,6 @@ export default class GeFormRenderer extends LightningElement{
     @track description = '';
     @track mappingSet = '';
     @track version = '';
-    _isElevateWidgetInDisabledState = false;
     _hasPaymentWidget = false;
     latestElevateBatchId = null;
     cardholderNamesNotInTemplate = {};
@@ -445,12 +447,7 @@ export default class GeFormRenderer extends LightningElement{
     }
 
     shouldDisplayWarningForRecurringGiftModal() {
-        const isReviewingOpportunity = !isEmptyObject(this.giftInView?.fields[DATA_IMPORT_DONATION_IMPORTED_FIELD.fieldApiName]);
-        const isReviewingPayment = !isEmptyObject(this.giftInView?.fields[DATA_IMPORT_PAYMENT_IMPORTED_FIELD.fieldApiName]);
-        const hasSoftCredits = this.hasSoftCredits();
-        const isGiftAuthorized = this.isGiftAuthorized();
-
-        return isGiftAuthorized || isReviewingOpportunity || isReviewingPayment || hasSoftCredits;
+        return this.hasSoftCredits();
     }
 
     displayWarningForRecurringGiftModal() {
@@ -889,6 +886,12 @@ export default class GeFormRenderer extends LightningElement{
         }
     }
 
+    nullRecurringFieldsInFormState(recurringFields) {
+        recurringFields.forEach(field => {
+            this.updateFormState({ [field]: null });
+        });
+    }
+
     async submitBatch(formControls, tokenizedGift) {
         this.handleNullPaymentFieldsInFormState();
 
@@ -923,6 +926,30 @@ export default class GeFormRenderer extends LightningElement{
         }
     }
 
+    nullGiftFieldsForTypeConversion() {
+        if (this.giftInView.hasConvertedToRecurringBatchItemType) {
+            this.nullPaymentFieldsInFormState([
+                apiNameFor(PAYMENT_AUTHORIZE_TOKEN),
+                apiNameFor(PAYMENT_DECLINED_REASON),
+                apiNameFor(PAYMENT_STATUS),
+                apiNameFor(PAYMENT_ELEVATE_ELEVATE_BATCH_ID),
+                apiNameFor(PAYMENT_ELEVATE_ID),
+                apiNameFor(PAYMENT_ELEVATE_ORIGINAL_PAYMENT_ID),
+                apiNameFor(PAYMENT_LAST_4),
+                apiNameFor(PAYMENT_CARD_NETWORK),
+                apiNameFor(PAYMENT_EXPIRATION_MONTH),
+                apiNameFor(PAYMENT_EXPIRATION_YEAR),
+                apiNameFor(PAYMENT_AUTHORIZED_AT),
+                apiNameFor(PAYMENT_GATEWAY_ID),
+                apiNameFor(PAYMENT_GATEWAY_TRANSACTION_ID)
+            ]);
+        } else if (this.giftInView.hasConvertedToElevateOneTimeBatchItemType) {
+            this.nullRecurringFieldsInFormState([
+                apiNameFor(DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID)
+            ]);
+        }
+    }
+
     handleLogError(error, context) {
         this.dispatchEvent(new CustomEvent('logerror', { 
             detail: {error: error, context: context}
@@ -943,7 +970,7 @@ export default class GeFormRenderer extends LightningElement{
             return false;
         }
 
-        return gift.isAuthorized();
+        return gift.hasElevateRemovableStatus();
     }
 
     shouldNullPaymentRelatedFields() {
@@ -965,10 +992,12 @@ export default class GeFormRenderer extends LightningElement{
 
         try {
             if (await this.shouldRemoveFromElevateBatch(gift, !!tokenizedGift)) {
-                await this.currentElevateBatch.remove(gift.asDataImport());
+                await this.currentElevateBatch.remove(gift);
                 if (!tokenizedGift) { this.handleNullPaymentFieldsInFormState(); }
+
                 result.wasRemoved = true;
             }
+            this.nullGiftFieldsForTypeConversion();
         } catch (exception) {
             const errorMsg = GeLabelService.format(
                 this.CUSTOM_LABELS.geErrorElevateUpdate, 
@@ -1404,7 +1433,11 @@ export default class GeFormRenderer extends LightningElement{
 
     get isUpdateActionDisabled() {
         return this.getFieldValueFromFormState(STATUS_FIELD) === 'Imported' ||
-               this.saveDisabled;
+               this.saveDisabled ||
+               (
+                   this.shouldShowElevateTransactionWarning &&
+                   this._isElevateWidgetInDisabledState
+               );
     }
 
     get cardholderNames() {
@@ -2868,15 +2901,22 @@ export default class GeFormRenderer extends LightningElement{
     }
 
     get elevateTransactionWarning() {
-        return format(this.CUSTOM_LABELS.gePaymentProcessedWarning, [this.CUSTOM_LABELS.commonPaymentServices]);
+        return this.CUSTOM_LABELS.bgeEditPaymentInformation;
     }
 
-    get showElevateTransactionWarning() {
+    get shouldShowElevateTransactionWarning() {
         const paymentStatus = this.getFieldValueFromFormState(PAYMENT_STATUS);
+        return  this.getFieldValueFromFormState(STATUS_FIELD) !== GIFT_STATUSES.IMPORTED &&
+                (
+                    this.hasUnprocessedReadOnlyPaymentStatus(paymentStatus) ||
+                    this.getFieldValueFromFormState(DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID)
+                );
+    }
+
+    hasUnprocessedReadOnlyPaymentStatus(paymentStatus) {
         return paymentStatus &&
-            (paymentStatus === this.PAYMENT_TRANSACTION_STATUS_ENUM.CAPTURED
-                || paymentStatus === this.PAYMENT_TRANSACTION_STATUS_ENUM.SUBMITTED
-                || paymentStatus === this.PAYMENT_TRANSACTION_STATUS_ENUM.SETTLED
+            (paymentStatus === this.PAYMENT_TRANSACTION_STATUS_ENUM.AUTHORIZED ||
+                paymentStatus === this.PAYMENT_TRANSACTION_STATUS_ENUM.PENDING
             );
     }
 
diff --git a/force-app/main/default/lwc/geFormWidget/geFormWidget.js b/force-app/main/default/lwc/geFormWidget/geFormWidget.js
index 93675f3013..c46a3a88c7 100644
--- a/force-app/main/default/lwc/geFormWidget/geFormWidget.js
+++ b/force-app/main/default/lwc/geFormWidget/geFormWidget.js
@@ -10,6 +10,8 @@ import DATA_IMPORT_ACCOUNT_NAME from '@salesforce/schema/DataImport__c.Account1_
 import DATA_IMPORT_PAYMENT_STATUS from '@salesforce/schema/DataImport__c.Payment_Status__c';
 import DATA_IMPORT_PARENT_BATCH_LOOKUP from '@salesforce/schema/DataImport__c.NPSP_Data_Import_Batch__c';
 import DATA_IMPORT_ID from '@salesforce/schema/DataImport__c.Id';
+import DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_Elevate_Recurring_ID__c';
 import DATA_IMPORT_STATUS from '@salesforce/schema/DataImport__c.Status__c';
 
 const ALLOCATION_WIDGET = 'geFormWidgetAllocation';
@@ -42,7 +44,8 @@ export default class GeFormWidget extends LightningElement {
         apiNameFor(DATA_IMPORT_ACCOUNT_NAME),
         apiNameFor(DATA_IMPORT_PAYMENT_STATUS),
         apiNameFor(DATA_IMPORT_STATUS),
-        apiNameFor(DATA_IMPORT_ID)
+        apiNameFor(DATA_IMPORT_ID),
+        apiNameFor(DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID)
     ];
 
     get giftInViewHasSchedule() {
diff --git a/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.js b/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.js
index f729ec86ce..d582dde736 100755
--- a/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.js
+++ b/force-app/main/default/lwc/geFormWidgetTokenizeCard/geFormWidgetTokenizeCard.js
@@ -42,8 +42,8 @@ import DATA_IMPORT_RECURRING_DONATION_CARD_EXPIRATION_YEAR
     from '@salesforce/schema/DataImport__c.Recurring_Donation_Card_Expiration_Year__c';
 import DATA_IMPORT_RECURRING_DONATION_CARD_EXPIRATION_MONTH
     from '@salesforce/schema/DataImport__c.Recurring_Donation_Card_Expiration_Month__c';
-import DATA_IMPORT_RECURRING_DONATION_INSTALLMENT_PERIOD
-    from '@salesforce/schema/DataImport__c.Recurring_Donation_Installment_Period__c';
+import DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_Elevate_Recurring_ID__c';
 import PAYMENT_EXPIRATION_YEAR from '@salesforce/schema/DataImport__c.Payment_Card_Expiration_Year__c';
 import PAYMENT_EXPIRATION_MONTH from '@salesforce/schema/DataImport__c.Payment_Card_Expiration_Month__c';
 import ACH_PAYMENT_LAST_4 from '@salesforce/schema/DataImport__c.Payment_ACH_Last_4__c';
@@ -193,7 +193,7 @@ export default class geFormWidgetTokenizeCard extends LightningElement {
         return Settings.isElevateCustomer()
             && this.isReadOnly
             && (this.isExpiredTransaction || this.hasEditableReadOnlyStatus ||
-                !!this._widgetDataFromState[apiNameFor(DATA_IMPORT_RECURRING_DONATION_INSTALLMENT_PERIOD)]);
+                !!this._widgetDataFromState[apiNameFor(DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID)]);
     }
 
     get shouldDisplayDoNotEnterPaymentInformation() {
diff --git a/force-app/main/default/lwc/geGift/__tests__/geGift.test.js b/force-app/main/default/lwc/geGift/__tests__/geGift.test.js
index fd3808b556..b2bdb9a42b 100644
--- a/force-app/main/default/lwc/geGift/__tests__/geGift.test.js
+++ b/force-app/main/default/lwc/geGift/__tests__/geGift.test.js
@@ -1,9 +1,28 @@
+import ScheduleDate from '@salesforce/schema/UserProvisioningRequest.ScheduleDate';
 import Gift from 'c/geGift';
 import { deepClone } from 'c/utilCommon';
 
 const mockGiftView = require('../../../../../../tests/__mocks__/apex/data/giftView.json');
 const DUMMY_GIFT_VIEW = { "Contact1Imported__c": "0032F00000iz5YhQAI", "Contact1Imported__r": { "Id": "0032F00000iz5YhQAI", "Name": "Gloria Howell" }, "Contact1_Firstname__c": "Gloria", "Contact1_Lastname__c": "Howell", "Contact1_Preferred_Email__c": "Personal", "DonationImportStatus__c": "Dry Run - Matched None", "Donation_Amount__c": 55, "Donation_Date__c": "2021-07-23", "Donation_Donor__c": "Contact1", "Id": "a0U2F000002HwNrUAK", "NPSP_Data_Import_Batch__c": "a0T2F00000307TAUAY", "NPSP_Data_Import_Batch__r": { "Id": "a0T2F00000307TAUAY", "Name": "Test Batch 0" }, "Payment_Method__c": "Check", "Status__c": "Dry Run - Validated" };
 const DUMMY_DATA_IMPORT = { "Contact1Imported__c": "0032F00000iz5YhQAI", "Contact1_Firstname__c": "Gloria", "Contact1_Lastname__c": "Howell", "Contact1_Preferred_Email__c": "Personal", "DonationImportStatus__c": "Dry Run - Matched None", "Donation_Amount__c": 55, "Donation_Date__c": "2021-07-23", "Donation_Donor__c": "Contact1", "Id": "a0U2F000002HwNrUAK", "NPSP_Data_Import_Batch__c": "a0T2F00000307TAUAY", "Payment_Method__c": "Check", "Status__c": "Dry Run - Validated" };
+const RD_DATAIMPORT_FIELDS = [
+    'Recurring_Donation_Recurring_Type__c',
+    'Recurring_Donation_Amount__c',
+    'Recurring_Donation_Day_of_Month__c',
+    'Recurring_Donation_Installment_Frequency__c',
+    'Recurring_Donation_Installment_Period__c',
+    'Recurring_Donation_Planned_Installments__c',
+    'Recurring_Donation_Effective_Date__c',
+    'Recurring_Donation_Date_Established__c',
+    'RecurringDonationImportStatus__c',
+    'Recurring_Donation_Payment_Method__c',
+    'Recurring_Donation_ACH_Last_4__c',
+    'Recurring_Donation_End_Date__c',
+    'Recurring_Donation_Name__c',
+    'Recurring_Donation_Status__c',
+    'Recurring_Donation_Status_Reason__c',
+    'RecurringDonationImported__c'
+];
 
 describe('ge-gift', () => {
 
@@ -12,6 +31,93 @@ describe('ge-gift', () => {
         jest.clearAllMocks();
     });
 
+    it ('removable elevate status should return false for imported status', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Status__c = 'Imported';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(false);
+    });
+
+    it ('removable elevate status should return false for missing elevate payment id', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Status__c = 'AUTHORIZED';
+        mockGiftViewTest.fields.Status__c = 'Dry Run - Validated';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(false);
+    });
+
+    it ('removable elevate status should return false for incorrect payment status', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Status__c = 'CAPTURED';
+        mockGiftViewTest.fields.Status__c = 'Dry Run - Validated';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(false);
+    });
+
+    it ('removable elevate status should return false for missing payment status', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Elevate_ID__c = 'DUMMY_PAYMENT_ID';
+        mockGiftViewTest.fields.Status__c = 'Dry Run - Validated';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(false);
+    });
+
+    it ('removable elevate status should return true with commitment id', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Recurring_Donation_Elevate_Recurring_ID__c = 'DUMMY_RECURRING_ID';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(true);
+    });
+
+    it ('removable elevate status should return true with authorized status', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Status__c = 'AUTHORIZED';
+        mockGiftViewTest.fields.Payment_Elevate_ID__c = 'DUMMY_PAYMENT_ID';
+        mockGiftViewTest.fields.Status__c = 'Dry Run - Validated';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(true);
+    });
+
+    it ('removable elevate status should return true with pending status', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Status__c = 'PENDING';
+        mockGiftViewTest.fields.Payment_Elevate_ID__c = 'DUMMY_PAYMENT_ID';
+        mockGiftViewTest.fields.Status__c = 'Dry Run - Validated';
+
+        const gift = new Gift(mockGiftViewTest);
+        expect(gift.hasElevateRemovableStatus()).toEqual(true);
+    });
+
+    it ('should return recurring id when converted to one-time gift type on remove action', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Elevate_ID__c = 'DUMMY_PAYMENT_ID';
+        mockGiftViewTest.fields.Recurring_Donation_Elevate_Recurring_ID__c = 'DUMMY_RECURRING_ID';
+
+        const gift = new Gift(mockGiftViewTest);
+        gift.removeSchedule({});
+        
+        expect(gift._hasConvertedToOneTimeBatchItemType).toEqual(true);
+        expect(gift.idToRemove()).toEqual('DUMMY_RECURRING_ID');
+    });
+
+    it ('should return payment id when converted to recurring gift type on remove action', async () => {
+        const mockGiftViewTest = deepClone(mockGiftView);
+        mockGiftViewTest.fields.Payment_Elevate_ID__c = 'DUMMY_PAYMENT_ID';
+        mockGiftViewTest.fields.Recurring_Donation_Elevate_Recurring_ID__c = 'DUMMY_RECURRING_ID';
+
+        const gift = new Gift(mockGiftViewTest);
+        gift.addSchedule({});
+
+        expect(gift._hasConvertedToRecurringBatchItemType).toEqual(true);
+        expect(gift.idToRemove()).toEqual('DUMMY_PAYMENT_ID');
+    });
+
     it('should initialize with expected properties', async () => {
         const gift = new Gift(mockGiftView);
         const giftState = gift.state();
@@ -122,6 +228,21 @@ describe('ge-gift', () => {
         expect(inboundGiftDTO.schedule).toBe(dummySchedule);
     });
 
+    it('should have schedule fields removed', async () => {
+        let fields = {};
+        RD_DATAIMPORT_FIELDS.forEach((fieldName) => {
+            fields[fieldName] = 'TEST_FIELD_VALUE'
+        });
+        const gift = new Gift({
+            fields: fields
+        });
+        gift.removeSchedule();
+
+        for (const fieldName of RD_DATAIMPORT_FIELDS) {
+            expect(gift.getFieldValue(fieldName)).toBeNull;
+        }
+    });
+
     it('should not have a schedule', async () => {
         const gift = new Gift({
             fields: {
diff --git a/force-app/main/default/lwc/geGift/geGift.js b/force-app/main/default/lwc/geGift/geGift.js
index 3f2e8f98cb..f9f35d3d77 100644
--- a/force-app/main/default/lwc/geGift/geGift.js
+++ b/force-app/main/default/lwc/geGift/geGift.js
@@ -18,6 +18,8 @@ class Gift {
     _softCredits = new SoftCredits();
     _schedule = {};
     _fields = {};
+    _hasConvertedToOneTimeBatchItemType = false;
+    _hasConvertedToRecurringBatchItemType = false;
 
     constructor(giftView) {
         this._init(giftView);
@@ -36,6 +38,19 @@ class Gift {
         }
     }
 
+    idToRemove() {
+        let id;
+        if (this.hasConvertedToElevateRecurringType()) {
+            id = this._fields[PAYMENT_ELEVATE_ID.fieldApiName];
+        } else if (this.hasConvertedToElevateOneTimeType()) {
+            id = this._fields[DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID.fieldApiName];
+        } else {
+            id = this._fields[PAYMENT_ELEVATE_ID.fieldApiName] ? this._fields[PAYMENT_ELEVATE_ID.fieldApiName] :
+                       this._fields[DATA_IMPORT_RECURRING_DONATION_ELEVATE_ID.fieldApiName]
+        }
+        return id;
+    }
+
     id() {
         return this._fields.Id;
     }
@@ -56,12 +71,16 @@ class Gift {
         this._schedule = scheduleData;
         const giftScheduleService = new GiftScheduleService();
         this._fields = giftScheduleService.addScheduleTo(this._fields, scheduleData);
+        this._hasConvertedToOneTimeBatchItemType = false;
+        this._hasConvertedToRecurringBatchItemType = true;
     }
 
     removeSchedule() {
         const giftScheduleService = new GiftScheduleService();
         this._fields = giftScheduleService.removeScheduleFromFields(this._fields);
         this._schedule = {};
+        this._hasConvertedToOneTimeBatchItemType = true;
+        this._hasConvertedToRecurringBatchItemType = false;
     }
 
     isFailed() {
@@ -124,6 +143,14 @@ class Gift {
         return this._fields[field];
     }
 
+    hasConvertedToElevateRecurringType() {
+        return this._hasConvertedToRecurringBatchItemType;
+    }
+
+    hasConvertedToElevateOneTimeType() {
+        return this._hasConvertedToOneTimeBatchItemType;
+    }
+
     asDataImport() {
         let dataImportRecord = { ...this._fields };
         delete dataImportRecord[undefined];
@@ -160,14 +187,21 @@ class Gift {
             fields: { ...this._fields },
             softCredits: JSON.stringify([ ...this._softCredits.unprocessedSoftCredits() ]),
             processedSoftCredits: JSON.stringify([ ...this._softCredits.processedSoftCredits() ]),
-            schedule: { ...this._schedule }
+            schedule: { ...this._schedule },
+            hasConvertedToRecurringBatchItemType: this._hasConvertedToRecurringBatchItemType,
+            hasConvertedToElevateOneTimeBatchItemType: this._hasConvertedToOneTimeBatchItemType
         }
     }
 
-    isAuthorized() {
-        return (this.getFieldValue(PAYMENT_STATUS.fieldApiName) === PAYMENT_STATUSES.AUTHORIZED
-            || this.getFieldValue(PAYMENT_STATUS.fieldApiName) === PAYMENT_STATUSES.PENDING)
-            && !!this.getFieldValue(PAYMENT_ELEVATE_ID.fieldApiName);
+    hasElevateRemovableStatus() {
+        return this.getFieldValue(STATUS.fieldApiName) !== GIFT_STATUSES.IMPORTED && (
+                (
+                    this.getFieldValue(PAYMENT_ELEVATE_ID.fieldApiName) &&
+                    this.getFieldValue(PAYMENT_STATUS.fieldApiName) === PAYMENT_STATUSES.AUTHORIZED ||
+                    this.getFieldValue(PAYMENT_STATUS.fieldApiName) === PAYMENT_STATUSES.PENDING
+                ) ||
+                this.hasCommitmentId()
+            );
     }
 }
 
diff --git a/force-app/main/default/lwc/geGift/geScheduleService.js b/force-app/main/default/lwc/geGift/geScheduleService.js
index 6f5dc5be2a..13be505c43 100644
--- a/force-app/main/default/lwc/geGift/geScheduleService.js
+++ b/force-app/main/default/lwc/geGift/geScheduleService.js
@@ -20,6 +20,18 @@ import RECURRING_DONATION_DATE_ESTABLISHED from '@salesforce/schema/DataImport__
 import RECURRING_DONATION_IMPORT_STATUS from '@salesforce/schema/DataImport__c.RecurringDonationImportStatus__c';
 import RECURRING_DONATION_PAYMENT_METHOD
     from '@salesforce/schema/DataImport__c.Recurring_Donation_Payment_Method__c';
+import RECURRING_DONATION_ACH_LAST_4
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_ACH_Last_4__c';
+import RECURRING_DONATION_END_DATE
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_End_Date__c';
+import RECURRING_DONATION_NAME
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_Name__c';
+import RECURRING_DONATION_STATUS
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_Status__c';
+import RECURRING_DONATION_STATUS_REASON
+    from '@salesforce/schema/DataImport__c.Recurring_Donation_Status_Reason__c';
+import RECURRING_DONATION_IMPORTED
+    from '@salesforce/schema/DataImport__c.RecurringDonationImported__c';
 import PAYMENT_METHOD from '@salesforce/schema/DataImport__c.Payment_Method__c';
 
 class GiftScheduleService {
@@ -50,7 +62,13 @@ class GiftScheduleService {
             [RECURRING_DONATION_RECURRING_AMOUNT.fieldApiName]: null,
             [RECURRING_DONATION_DATE_ESTABLISHED.fieldApiName]: null,
             [RECURRING_DONATION_IMPORT_STATUS.fieldApiName]: null,
-            [RECURRING_DONATION_PAYMENT_METHOD.fieldApiName]: null
+            [RECURRING_DONATION_PAYMENT_METHOD.fieldApiName]: null,
+            [RECURRING_DONATION_ACH_LAST_4.fieldApiName]: null,
+            [RECURRING_DONATION_END_DATE.fieldApiName]: null,
+            [RECURRING_DONATION_NAME.fieldApiName]: null,
+            [RECURRING_DONATION_STATUS.fieldApiName]: null,
+            [RECURRING_DONATION_STATUS_REASON.fieldApiName]: null,
+            [RECURRING_DONATION_IMPORTED.fieldApiName]: null
         }
     }
 
diff --git a/force-app/main/default/lwc/geGiftEntryFormApp/__tests__/geGiftEntryFormApp.test.js b/force-app/main/default/lwc/geGiftEntryFormApp/__tests__/geGiftEntryFormApp.test.js
index 0aeb30b3c0..3e58ceb3ca 100644
--- a/force-app/main/default/lwc/geGiftEntryFormApp/__tests__/geGiftEntryFormApp.test.js
+++ b/force-app/main/default/lwc/geGiftEntryFormApp/__tests__/geGiftEntryFormApp.test.js
@@ -31,6 +31,7 @@ import DATA_IMPORT_BATCH_OBJECT from '@salesforce/schema/DataImportBatch__c';
 import OPPORTUNITY_OBJECT from '@salesforce/schema/Opportunity';
 import FAILURE_INFORMATION from '@salesforce/schema/DataImport__c.FailureInformation__c';
 import accountDonorSelectionMismatch from '@salesforce/label/c.geErrorDonorMismatch';
+import { fireEvent } from '../../pubsubNoPageRef/pubsubNoPageRef';
 
 const PROCESSING_BATCH_MESSAGE = 'c.geProcessingBatch';
 
@@ -233,26 +234,145 @@ describe('c-ge-gift-entry-form-app', () => {
             expect(spiedEventModalProperties.componentName).toEqual('geModalPrompt');
             expect(spiedEventModalProperties.showCloseButton).toEqual(true);
         });
+    });
 
-        it('should render loading spinner when opening an existing gift from the batch table', async () => {
-            const formApp = setupForBatchMode({gifts: [{ fields: { id: 'dummyGiftId' }}], totals: { TOTAL: 1, }});
-            document.body.appendChild(formApp);
+    describe('event dispatch and handling behavior', () => {
+        it('should disable update button when widget is read-only with an editable recurring gift', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID',
+                                                                 'Recurring_Donation_Elevate_Recurring_ID__c': 'DUMMY_RECURRING_ID'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'}
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelector(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toBeTruthy();
 
+            pubSub.fireEvent({}, 'widgetStateChange', {state: 'readOnly'});
+            await flushPromises();
+            
+            const saveButton = shadowQuerySelector(geFormRenderer, '[data-id="formSaveButton"]');
+            expect(saveButton.disabled).toBe(true);
+        });
+        it('should disable update button when widget is read-only with an editable status for one-time gift', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID',
+                                                                 'Payment_Status__c': 'AUTHORIZED'}}], totals: { TOTAL: 1 }});
             await flushPromises();
 
             const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
-            expect(batchTable).toBeTruthy();
-            runWithFakeTimer(async () => {
-                batchTable.dispatchEvent(new CustomEvent('loaddata', { detail: { id: 'dummyGiftId' } }));
-                await flushPromises();
-                expect(spinner(formApp)).toBeTruthy();
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'}
             });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
 
-            expect(spinner(formApp)).toBeFalsy();
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelector(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toBeTruthy();
+
+            pubSub.fireEvent({}, 'widgetStateChange', {state: 'readOnly'});
+            await flushPromises();
+            
+            const saveButton = shadowQuerySelector(geFormRenderer, '[data-id="formSaveButton"]');
+            expect(saveButton.disabled).toBe(true);
+        });
+
+        it('should not display widget warning captured gift is loadeed', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID', 'Payment_Status__c': 'CAPTURED'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'
+                }
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelectorAll(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toHaveLength(0);
+        });
+
+        it('should display widget warning when one-time gift read-only status is loadeed', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID', 'Payment_Status__c': 'PENDING'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'
+                }
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelector(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toBeTruthy();
+        });
+        it('should display widget warning when one-time gift read-only status is loaded', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID', 'Payment_Status__c': 'AUTHORIZED'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'
+                }
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelectorAll(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toHaveLength(1);
+        });
+
+        it('should display widget warning when recurring gift is loadeed', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID', 'Recurring_Donation_Elevate_Recurring_ID__c': 'TEST_RECURRING_ID'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'
+                }
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelectorAll(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toHaveLength(1);
+        });
+
+        it('should not display widget warning when imported gift is loaded', async() => {
+            const formApp = setupForBatchMode({gifts: [{fields: {'Id': 'DUMMY_RECORD_ID', 'Status__c': 'Imported'}}], totals: { TOTAL: 1 }});
+            await flushPromises();
+
+            const batchTable = shadowQuerySelector(formApp, 'c-ge-batch-gift-entry-table');
+            const loadDataEvent = new CustomEvent('loaddata', {
+                detail : {
+                    'Id': 'DUMMY_RECORD_ID'
+                }
+            });
+            batchTable.dispatchEvent(loadDataEvent);
+            await flushPromises();
+
+            const geFormRenderer = shadowQuerySelector(formApp, 'c-ge-form-renderer');
+            const warningMessage = shadowQuerySelectorAll(geFormRenderer, '[data-id="elevateTrnxWarning"]');
+            expect(warningMessage).toHaveLength(0);
         });
-    });
 
-    describe('event dispatch and handling behavior', () => {
         it('should dispatch edit batch event', async () => {
             const formApp = setupForBatchMode({gifts: [], totals: { TOTAL: 1 }});
 
diff --git a/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.html b/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.html
index 8dc37b7a95..00919084bb 100644
--- a/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.html
+++ b/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.html
@@ -68,6 +68,7 @@ <h1 slot="title">
                                 onnavigate={handleNavigateEvent}
                                 loading-text={loadingText}
                                 save-disabled={isFormSaveDisabled}
+                                is-make-recurring-button-disabled={shouldDisableMakeRecurringButton}
                                 batch-currency-iso-code={batchCurrencyIsoCode}
                                 >
                         </c-ge-form-renderer>
diff --git a/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.js b/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.js
index 0a4c8d0920..3e2e588a97 100644
--- a/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.js
+++ b/force-app/main/default/lwc/geGiftEntryFormApp/geGiftEntryFormApp.js
@@ -83,27 +83,25 @@ export default class GeGiftEntryFormApp extends NavigationMixin(LightningElement
         }
     }
 
+    get shouldDisableMakeRecurringButton() {
+        return this.gift.isImported();
+    }
+
     handleLoadData(event) {
         try {
             this.isFormRendering = true;
+            const giftId = event.detail.Id;
+            const foundGift = this.giftBatch.findGiftBy(giftId);
+            this.gift = new Gift(foundGift.state());
+            this.giftInView = this.gift.state();
+            this.openedGiftDonationId = this.gift.donationId();
 
-            new Promise((resolve,reject) => {
-                setTimeout(()=> {
-                    const giftId = event.detail.Id;
-                    const foundGift = this.giftBatch.findGiftBy(giftId);
-                    this.gift = new Gift(foundGift.state());
-                    this.giftInView = this.gift.state();
-                    this.openedGiftDonationId = this.gift.donationId();
-                    if (this.isFormCollapsed) {
-                        this.isFormCollapsed = false;
-                    }
-                    fireEvent(this, 'resetElevateWidget', {});
-                    resolve();
-                }, 100);
-            })
-            .finally(() => {
-                this.isFormRendering = false;
-            });
+            if (this.isFormCollapsed) {
+                this.isFormCollapsed = false;
+            }
+            fireEvent(this, 'resetElevateWidget', {});
+            
+            this.isFormRendering = false;
         } catch(error) {
             handleError(error);
         }
@@ -574,7 +572,7 @@ export default class GeGiftEntryFormApp extends NavigationMixin(LightningElement
         let isRemovedFromElevate = false;
         if (this.shouldRemoveFromElevateBatch(gift)) {
             try {
-                await this.deleteFromElevateBatch(gift.asDataImport());
+                await this.deleteFromElevateBatch(gift);
                 isRemovedFromElevate = true;
             } catch (exception) {
                 let errorMsg = GeLabelService.format(
@@ -619,10 +617,7 @@ export default class GeGiftEntryFormApp extends NavigationMixin(LightningElement
     shouldRemoveFromElevateBatch(gift) {
         return gift &&
             this.isElevateCustomer &&
-            !gift.isImported() && (
-                gift.hasCommitmentId() ||
-                gift.isAuthorized()
-            );
+            gift.hasElevateRemovableStatus();
     }
 
     async deleteFromElevateBatch(gift) {
diff --git a/force-app/main/default/lwc/geLabelService/geLabelService.js b/force-app/main/default/lwc/geLabelService/geLabelService.js
index 4c193f5662..e76c94e67a 100755
--- a/force-app/main/default/lwc/geLabelService/geLabelService.js
+++ b/force-app/main/default/lwc/geLabelService/geLabelService.js
@@ -3,6 +3,7 @@ import { format } from 'c/utilCommon';
 
 // Import custom labels
 import bgeGridNoGiftsBody from '@salesforce/label/c.bgeGridNoGiftsBody';
+import bgeEditPaymentInformation from '@salesforce/label/c.bgeEditPaymentInformation';
 import bgeGridNoGiftsHeader from '@salesforce/label/c.bgeGridNoGiftsHeader';
 import commonAccountNumber from '@salesforce/label/c.commonAccountNumber';
 import commonACHLast4 from '@salesforce/label/c.commonACHLast4';
@@ -210,7 +211,6 @@ import geLabelTemplateInfoDescriptionField from '@salesforce/label/c.geLabelTemp
 import geLabelTemplateInfoNameField from '@salesforce/label/c.geLabelTemplateInfoNameField';
 import gePaymentAuthExpiredHeader from '@salesforce/label/c.gePaymentAuthExpiredHeader';
 import gePaymentAuthExpiredWarningText from '@salesforce/label/c.gePaymentAuthExpiredWarningText';
-import gePaymentProcessedWarning from '@salesforce/label/c.gePaymentProcessedWarning';
 import gePaymentProcessError from '@salesforce/label/c.gePaymentProcessError';
 import gePaymentProcessingErrorBanner from '@salesforce/label/c.gePaymentProcessingErrorBanner';
 import gePaymentRequestTimedOut from '@salesforce/label/c.gePaymentRequestTimedOut';
@@ -263,6 +263,7 @@ class GeLabelService {
     CUSTOM_LABELS = Object.freeze({
         bgeGridNoGiftsBody,
         bgeGridNoGiftsHeader,
+        bgeEditPaymentInformation,
         commonAccountNumber,
         commonACHLast4,
         commonAmount,
@@ -469,7 +470,6 @@ class GeLabelService {
         geLabelTemplateInfoNameField,
         gePaymentAuthExpiredHeader,
         gePaymentAuthExpiredWarningText,
-        gePaymentProcessedWarning,
         gePaymentProcessError,
         gePaymentProcessingErrorBanner,
         gePaymentRequestTimedOut,
diff --git a/force-app/main/default/translations/de.translation-meta.xml b/force-app/main/default/translations/de.translation-meta.xml
index c03ac11b2f..e6bb3deb80 100644
--- a/force-app/main/default/translations/de.translation-meta.xml
+++ b/force-app/main/default/translations/de.translation-meta.xml
@@ -4988,10 +4988,6 @@ Wenn Sie es vorziehen, können Sie &quot;Spendeneintrag&quot; deaktivieren und s
         <name>gePaymentAuthExpiredWarningText</name>
         <label>Mindestens eine Kartenautorisierung ist abgelaufen. Damit sichergestellt ist, dass diese Zahlungen beim Verarbeiten des Batches belastet werden, geben Sie die Zahlungsinformationen für Spenden mit dem Elevate-Zahlungsstatus &quot;Autorisierung abgelaufen&quot; erneut ein.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} hat die Zahlung erfolgreich verarbeitet. Das Ändern von Spender, Datum, Betrag oder Zahlungsmethode führt zu inkonsistenten Datensätzen für die gleiche Transaktion in {0} und NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>Fehler beim Verarbeiten der Zahlung. Bitte überprüfen Sie den Fehler, und versuchen Sie es erneut. Wählen Sie
diff --git a/force-app/main/default/translations/en_GB.translation-meta.xml b/force-app/main/default/translations/en_GB.translation-meta.xml
index 35d6b3f3c8..bf5c1cb212 100644
--- a/force-app/main/default/translations/en_GB.translation-meta.xml
+++ b/force-app/main/default/translations/en_GB.translation-meta.xml
@@ -4989,10 +4989,6 @@ If preferred, you can disable Gift Entry and instead use older Batch Gift Entry
         <name>gePaymentAuthExpiredWarningText</name>
         <label>One or more card authorisations expired. To ensure these payments are charged when processing the batch, reenter the payment information for donations with an Elevate Payment Status of Expired Authorisation.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} successfully processed the payment. Changing the donor, date, amount, or payment method will result in inconsistent records for the same transaction in {0} and NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>There was an error processing the payment. Please review the error and try again. Alternatively,
diff --git a/force-app/main/default/translations/es.translation-meta.xml b/force-app/main/default/translations/es.translation-meta.xml
index 61998f0843..9354e402f1 100644
--- a/force-app/main/default/translations/es.translation-meta.xml
+++ b/force-app/main/default/translations/es.translation-meta.xml
@@ -4982,10 +4982,6 @@ Si lo prefiere, puede desactivar Entrada de regalos y utilizar la herramienta En
         <name>gePaymentAuthExpiredWarningText</name>
         <label>Una o más autorizaciones de tarjeta caducaron. Para garantizar que estos pagos se carguen cuando se procese el lote, vuelva a introducir la información de pago para donaciones con un Estado de pago de Elevate de Autorización caducada.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} procesó correctamente el pago. Al cambiar el donante, la fecha, el importe o el método de pago dará como resultado registros incoherentes para la misma transacción en {0} y NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>Se produjo un error al procesar el pago. Revise el error e inténtelo de nuevo. De manera alternativa,
diff --git a/force-app/main/default/translations/fr.translation-meta.xml b/force-app/main/default/translations/fr.translation-meta.xml
index 568fc1f1e9..931a303e89 100644
--- a/force-app/main/default/translations/fr.translation-meta.xml
+++ b/force-app/main/default/translations/fr.translation-meta.xml
@@ -4990,10 +4990,6 @@ Si vous préférez, vous pouvez désactiver la Saisie de dons et utiliser à la
         <name>gePaymentAuthExpiredWarningText</name>
         <label>Une ou plusieurs autorisations de carte ont expiré. Pour vous assurer que ces paiements sont débités lors du traitement du lot, saisissez à nouveau les informations de paiement pour les dons dont le statut de paiement est Autorisation expirée.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} a traité le paiement. La modification du donateur, de la date, du montant ou du mode de paiement entraînera des incohérences dans les enregistrements pour la même transaction dans {0} et NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>Une erreur s’est produite lors du traitement du paiement. Examinez l’erreur et réessayez. Vous pouvez également
diff --git a/force-app/main/default/translations/iw.translation-meta.xml b/force-app/main/default/translations/iw.translation-meta.xml
index cab8001ae5..5344c62e2f 100644
--- a/force-app/main/default/translations/iw.translation-meta.xml
+++ b/force-app/main/default/translations/iw.translation-meta.xml
@@ -3866,10 +3866,6 @@
         <label><!-- Failure message description for tokenization or purchase errors --></label>
         <name>gePaymentProcessError</name>
     </customLabels>
-    <customLabels>
-        <label><!-- Warning about editing fields when transaction already processed --></label>
-        <name>gePaymentProcessedWarning</name>
-    </customLabels>
     <customLabels>
         <label><!-- Field Bundle banner failure message for tokenization or purchase errors --></label>
         <name>gePaymentProcessingErrorBanner</name>
diff --git a/force-app/main/default/translations/ja.translation-meta.xml b/force-app/main/default/translations/ja.translation-meta.xml
index f15ba883a2..4d0dea4c86 100644
--- a/force-app/main/default/translations/ja.translation-meta.xml
+++ b/force-app/main/default/translations/ja.translation-meta.xml
@@ -4985,10 +4985,6 @@
         <name>gePaymentAuthExpiredWarningText</name>
         <label>1 件以上のカード承認の期限が切れました。バッチを処理するときにこれらの支払が課金されるようにするには、期限が切れた承認の Elevate 支払状況を使用して支援の支払情報を再入力してください。</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} が支払を正常に処理しました。支援者、日付、金額、または支払方法を変更すると、{0} と NPSP で同じトランザクションのレコードで整合性が失われます。</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>支払の処理中に問題が発生しました。エラーを確認して、もう一度お試しください。または、
diff --git a/force-app/main/default/translations/nl_NL.translation-meta.xml b/force-app/main/default/translations/nl_NL.translation-meta.xml
index 851863c72c..322616c53e 100644
--- a/force-app/main/default/translations/nl_NL.translation-meta.xml
+++ b/force-app/main/default/translations/nl_NL.translation-meta.xml
@@ -4988,10 +4988,6 @@ Indien dit de voorkeur heeft, kunt u Invoer van giften uitschakelen en in plaats
         <name>gePaymentAuthExpiredWarningText</name>
         <label>Een of meerdere kaartautorisaties zijn verlopen. Om ervoor te zorgen dat deze betalingen in rekening worden gebracht bij het verwerken van de batch, voert u de betalingsinformatie voor donaties opnieuw in met de Elevate-betaalstatus Autorisatie verlopen.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} heeft de betaling verwerkt. Als u de donateur, de datum, het bedrag of de betalingswijze wijzigt, krijgt u inconsistente records voor dezelfde transactie in {0} en NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>Er is een fout opgetreden bij het verwerken van de betaling. Controleer de fout en probeer het opnieuw. In plaats daarvan kunt u het volgende doen:
diff --git a/force-app/main/default/translations/pt_BR.translation-meta.xml b/force-app/main/default/translations/pt_BR.translation-meta.xml
index 0e61692719..120cf62021 100644
--- a/force-app/main/default/translations/pt_BR.translation-meta.xml
+++ b/force-app/main/default/translations/pt_BR.translation-meta.xml
@@ -4989,10 +4989,6 @@ Se preferir, você pode desativar a Entrada de doações e, em vez disso, usar a
         <name>gePaymentAuthExpiredWarningText</name>
         <label>Uma ou mais autorizações de cartão expiraram. Para garantir que esses pagamentos sejam cobrados ao processar o lote, reinsira as informações de pagamento de doações com status de pagamento Elevate de Autorização vencida.</label>
     </customLabels>
-    <customLabels>
-        <name>gePaymentProcessedWarning</name>
-        <label>{0} processou com sucesso o pagamento. A alteração de doador, data, valor ou método de pagamento resultará em registros inconsistentes para a mesma transação em {0} e no NPSP.</label>
-    </customLabels>
     <customLabels>
         <name>gePaymentProcessError</name>
         <label>Houve um erro no processamento do pagamento. Reveja o erro e tente novamente. Como alternativa,