diff --git a/src/elements/internal/InternalCalendar/InternalCalendar.ts b/src/elements/internal/InternalCalendar/InternalCalendar.ts
index 36bcb2d8..ba80a462 100644
--- a/src/elements/internal/InternalCalendar/InternalCalendar.ts
+++ b/src/elements/internal/InternalCalendar/InternalCalendar.ts
@@ -3,6 +3,7 @@ import { LitElement, PropertyDeclarations, TemplateResult, html } from 'lit-elem
 import { ThemeableMixin } from '../../../mixins/themeable';
 import { classMap } from '../../../utils/class-map';
 import { parseDate } from '../../../utils/parse-date';
+import { safeDate } from '../../../utils/safe-date';
 import { serializeDate } from '../../../utils/serialize-date';
 
 export class InternalCalendar extends ThemeableMixin(LitElement) {
@@ -97,7 +98,7 @@ export class InternalCalendar extends ThemeableMixin(LitElement) {
 
   private __renderMonth(month: number, year: number) {
     const lang = this.lang || navigator.language;
-    const date = new Date(year, month, 1, 0, 0, 0, 0);
+    const date = safeDate(year, month, 1);
     const items: TemplateResult[] = [];
 
     for (let i = 0; i < 7; ++i) {
@@ -145,7 +146,7 @@ export class InternalCalendar extends ThemeableMixin(LitElement) {
 
   private __renderDate(date: number, month: number, year: number, checked = false) {
     const disabled =
-      this.disabled || this.readonly || !this.checkAvailability(new Date(year, month, date));
+      this.disabled || this.readonly || !this.checkAvailability(safeDate(year, month, date));
 
     return html`
       <label
@@ -166,7 +167,7 @@ export class InternalCalendar extends ThemeableMixin(LitElement) {
           class="sr-only"
           ?disabled=${this.readonly || this.disabled || disabled}
           @change=${() => {
-            this.__valueAsDate = new Date(year, month, date);
+            this.__valueAsDate = safeDate(year, month, date);
             this.dispatchEvent(new CustomEvent('change'));
           }}
         />
diff --git a/src/elements/internal/InternalDateControl/InternalDateControl.ts b/src/elements/internal/InternalDateControl/InternalDateControl.ts
index e3659b8a..2bd5e85c 100644
--- a/src/elements/internal/InternalDateControl/InternalDateControl.ts
+++ b/src/elements/internal/InternalDateControl/InternalDateControl.ts
@@ -10,6 +10,7 @@ import { html } from 'lit-element';
 import { getWeekdayShortNames } from './getWeekdayShortNames';
 import { getWeekdayLongNames } from './getWeekdayLongNames';
 import { getMonthNames } from './getMonthNames';
+import { safeDate } from '../../../utils/safe-date';
 
 /**
  * Internal control displaying a basic date picker box.
@@ -102,7 +103,7 @@ export class InternalDateControl extends InternalEditableControl {
       parseDate: null,
       formatTitle: (m: string, y: string) => m + ' ' + y,
       formatDate: (d: { day: number; month: number; year: number }) => {
-        return this.t('display_value', { value: new Date(d.year, d.month, d.day) });
+        return this.t('display_value', { value: safeDate(d.year, d.month, d.day) });
       },
     };
   }
diff --git a/src/elements/internal/InternalEditableListControl/InternalEditableListControl.test.ts b/src/elements/internal/InternalEditableListControl/InternalEditableListControl.test.ts
index d61edeed..b1915362 100644
--- a/src/elements/internal/InternalEditableListControl/InternalEditableListControl.test.ts
+++ b/src/elements/internal/InternalEditableListControl/InternalEditableListControl.test.ts
@@ -163,6 +163,26 @@ describe('InternalEditableListControl', () => {
     expect(value).to.deep.equal([{ value: 'foo,bar', unit: '' }]);
   });
 
+  it('can add items on blur (non-range only)', async () => {
+    const layout = html`<foxy-internal-editable-list-control></foxy-internal-editable-list-control>`;
+    const element = await fixture<Control>(layout);
+
+    let value: unknown = [];
+    element.getValue = () => value;
+    element.setValue = newValue => (value = newValue);
+    await element.requestUpdate();
+
+    const input = element.renderRoot.querySelector('input') as HTMLInputElement;
+    const whenChangeEmitted = oneEvent(element, 'change');
+
+    input.value = 'foo';
+    input.dispatchEvent(new InputEvent('input'));
+    input.dispatchEvent(new FocusEvent('blur'));
+
+    expect(await whenChangeEmitted).to.be.instanceOf(CustomEvent);
+    expect(value).to.deep.equal([{ value: 'foo', unit: '' }]);
+  });
+
   it('can add items on paste (multiline text - split into multiple entries)', async () => {
     const element = await fixture<Control>(html`
       <foxy-internal-editable-list-control></foxy-internal-editable-list-control>
diff --git a/src/elements/internal/InternalEditableListControl/InternalEditableListControl.ts b/src/elements/internal/InternalEditableListControl/InternalEditableListControl.ts
index aaae1a40..66dd0a1d 100644
--- a/src/elements/internal/InternalEditableListControl/InternalEditableListControl.ts
+++ b/src/elements/internal/InternalEditableListControl/InternalEditableListControl.ts
@@ -272,6 +272,7 @@ export class InternalEditableListControl extends InternalEditableControl {
                   }}
                   @blur=${() => {
                     this.__isErrorVisible = true;
+                    addItem();
                   }}
                 />
               `}
diff --git a/src/elements/internal/InternalPostActionControl/InternalPostActionControl.ts b/src/elements/internal/InternalPostActionControl/InternalPostActionControl.ts
index e119d254..6b3d84da 100644
--- a/src/elements/internal/InternalPostActionControl/InternalPostActionControl.ts
+++ b/src/elements/internal/InternalPostActionControl/InternalPostActionControl.ts
@@ -37,6 +37,7 @@ export class InternalPostActionControl extends InternalControl {
 
       <vaadin-button
         theme=${ifDefined(this.theme ?? void 0)}
+        class="w-full"
         ?disabled=${this.disabled || this.readonly}
         @click=${(evt: CustomEvent) => {
           const button = evt.currentTarget as ButtonElement;
diff --git a/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.test.ts b/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.test.ts
index 3209b493..9cada296 100644
--- a/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.test.ts
+++ b/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.test.ts
@@ -102,6 +102,37 @@ describe('AdminSubscriptionForm', () => {
       expect($('foxy-i18n[infer=""][key="cancel_how_to_reactivate_text"]')).to.exist;
     });
 
+    it('renders text content for the Cancel state for future subscriptions', async () => {
+      const $ = (selector: string) => form.renderRoot.querySelector(selector);
+      const router = createRouter();
+      const form = await fixture<Form>(html`
+        <foxy-internal-admin-subscription-form-status-action-form
+          href="https://demo.api/hapi/subscriptions/0"
+          @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+        >
+        </foxy-internal-admin-subscription-form-status-action-form>
+      `);
+
+      await waitUntil(() => !!form.data, undefined, { timeout: 5000 });
+
+      form.data = {
+        ...form.data!,
+        is_active: true,
+        start_date: serializeDate(new Date(Date.now() + 86400000)),
+      };
+
+      await form.requestUpdate();
+
+      expect($('foxy-i18n[infer=""][key="cancel_title"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_subtitle_future"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_why_not_today_title"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_why_not_today_text_future"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_whats_next_title"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_whats_next_text_future"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_how_to_reactivate_title"]')).to.exist;
+      expect($('foxy-i18n[infer=""][key="cancel_how_to_reactivate_text"]')).to.exist;
+    });
+
     it('renders text content for the Reactivate state', async () => {
       const $ = (selector: string) => form.renderRoot.querySelector(selector);
       const router = createRouter();
@@ -170,6 +201,54 @@ describe('AdminSubscriptionForm', () => {
       expect(form.form.end_date).to.equal('');
     });
 
+    it('renders end date presets in the Cancel state for future subscriptions', async () => {
+      const router = createRouter();
+      const form = await fixture<Form>(html`
+        <foxy-internal-admin-subscription-form-status-action-form
+          href="https://demo.api/hapi/subscriptions/0"
+          @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+        >
+        </foxy-internal-admin-subscription-form-status-action-form>
+      `);
+
+      await waitUntil(() => !!form.data, undefined, { timeout: 5000 });
+
+      form.data = {
+        ...form.data!,
+        is_active: true,
+        start_date: serializeDate(new Date(Date.now() + 86400000)),
+      };
+
+      await form.requestUpdate();
+
+      const select = form.renderRoot.querySelector<InternalSelectControl>(
+        'foxy-internal-select-control[infer="end-date-preset"]'
+      );
+
+      expect(select).to.exist;
+      expect(select).to.have.attribute(
+        'options',
+        JSON.stringify([
+          { value: 'start_date', label: 'option_start_date' },
+          { value: 'next_transaction_date', label: 'option_next_transaction_date' },
+          { value: 'custom_date', label: 'option_custom_date' },
+        ])
+      );
+
+      expect(select?.getValue()).to.equal('next_transaction_date');
+      form.edit({ end_date_preset: 'start_date' });
+      expect(select?.getValue()).to.equal('start_date');
+
+      select?.setValue('next_transaction_date');
+      expect(form.form.end_date).to.equal(form.form.next_transaction_date);
+
+      select?.setValue('start_date');
+      expect(form.form.end_date).to.equal(form.data!.start_date);
+
+      select?.setValue('custom_date');
+      expect(form.form.end_date).to.equal('');
+    });
+
     it('renders end date field in the Cancel state', async () => {
       const router = createRouter();
       const form = await fixture<Form>(html`
diff --git a/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.ts b/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.ts
index f34dc92c..ecfe4b26 100644
--- a/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.ts
+++ b/src/elements/public/AdminSubscriptionForm/internal/InternalAdminSubscriptionFormStatusActionForm/InternalAdminSubscriptionFormStatusActionForm.ts
@@ -29,6 +29,12 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
     { value: 'custom_date', label: 'option_custom_date' },
   ]);
 
+  private readonly __endDatePresetOptionsForFutureSubs = JSON.stringify([
+    { value: 'start_date', label: 'option_start_date' },
+    { value: 'next_transaction_date', label: 'option_next_transaction_date' },
+    { value: 'custom_date', label: 'option_custom_date' },
+  ]);
+
   private readonly __endDatePresetGetValue = () =>
     this.form.end_date_preset ?? 'next_transaction_date';
 
@@ -40,6 +46,8 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
       tomorrowDate.setDate(tomorrowDate.getDate() + 1);
       tomorrowDate.setHours(0, 0, 0, 0);
       this.edit({ end_date: serializeDate(tomorrowDate) });
+    } else if (newValue === 'start_date') {
+      this.edit({ end_date: this.data?.start_date ?? '' });
     } else if (newValue === 'next_transaction_date') {
       this.edit({ end_date: this.form.next_transaction_date });
     } else {
@@ -83,6 +91,12 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
       ? svg`<svg class="text-error" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" style="width: 2rem; height: 2rem;"><path stroke-linecap="round" stroke-linejoin="round" d="M5.25 7.5A2.25 2.25 0 0 1 7.5 5.25h9a2.25 2.25 0 0 1 2.25 2.25v9a2.25 2.25 0 0 1-2.25 2.25h-9a2.25 2.25 0 0 1-2.25-2.25v-9Z" /></svg>`
       : svg`<svg class="text-success" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" style="width: 2rem; height: 2rem;"><path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" /></svg>`;
 
+    const startDate = this.data ? parseDate(this.data.start_date) : null;
+    const isFutureSubscription = !!startDate && startDate > new Date();
+    const datePickerMin = serializeDate(
+      new Date(Math.max(tomorrowDate.getTime(), startDate?.getTime() ?? tomorrowDate.getTime()))
+    );
+
     return html`
       <foxy-internal-summary-control infer="" label="" helper-text="">
         <div class="text-center flex flex-col items-center bg-transparent">
@@ -91,7 +105,8 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
             <foxy-i18n infer="" key="${action}_title"></foxy-i18n>
           </p>
           <p class="text-secondary leading-s">
-            <foxy-i18n infer="" key="${action}_subtitle"></foxy-i18n>
+            <foxy-i18n infer="" key="${action}_subtitle${isFutureSubscription ? '_future' : ''}">
+            </foxy-i18n>
           </p>
         </div>
       </foxy-internal-summary-control>
@@ -100,7 +115,9 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
         ${isActive
           ? html`
               <foxy-internal-select-control
-                options=${this.__endDatePresetOptions}
+                options=${isFutureSubscription
+                  ? this.__endDatePresetOptionsForFutureSubs
+                  : this.__endDatePresetOptions}
                 layout="summary-item"
                 infer="end-date-preset"
                 .getValue=${this.__endDatePresetGetValue}
@@ -111,7 +128,7 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
               <foxy-internal-date-control
                 layout="summary-item"
                 infer="end-date"
-                min=${serializeDate(tomorrowDate)}
+                min=${datePickerMin}
                 hide-clear-button
                 .getValue=${this.__endDateGetValue}
               >
@@ -121,7 +138,7 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
               <foxy-internal-date-control
                 layout="summary-item"
                 infer="next-transaction-date"
-                min=${serializeDate(tomorrowDate)}
+                min=${datePickerMin}
                 hide-clear-button
                 .getValue=${this.__nextTransactionDateGetValue}
               >
@@ -134,11 +151,13 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
           ? [
               this.__renderFaq(
                 'cancel_why_not_today',
-                svg`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="text-error flex-shrink-0" style="width: 1.25em; height: 1.25em;"><path d="M5.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H6a.75.75 0 0 1-.75-.75V12ZM6 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H6ZM7.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H8a.75.75 0 0 1-.75-.75V12ZM8 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H8ZM9.25 10a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H10a.75.75 0 0 1-.75-.75V10ZM10 11.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V12a.75.75 0 0 0-.75-.75H10ZM9.25 14a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H10a.75.75 0 0 1-.75-.75V14ZM12 9.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V10a.75.75 0 0 0-.75-.75H12ZM11.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H12a.75.75 0 0 1-.75-.75V12ZM12 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H12ZM13.25 10a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H14a.75.75 0 0 1-.75-.75V10ZM14 11.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V12a.75.75 0 0 0-.75-.75H14Z" /><path fill-rule="evenodd" d="M5.75 2a.75.75 0 0 1 .75.75V4h7V2.75a.75.75 0 0 1 1.5 0V4h.25A2.75 2.75 0 0 1 18 6.75v8.5A2.75 2.75 0 0 1 15.25 18H4.75A2.75 2.75 0 0 1 2 15.25v-8.5A2.75 2.75 0 0 1 4.75 4H5V2.75A.75.75 0 0 1 5.75 2Zm-1 5.5c-.69 0-1.25.56-1.25 1.25v6.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-6.5c0-.69-.56-1.25-1.25-1.25H4.75Z" clip-rule="evenodd" /></svg>`
+                svg`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="text-error flex-shrink-0" style="width: 1.25em; height: 1.25em;"><path d="M5.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H6a.75.75 0 0 1-.75-.75V12ZM6 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H6ZM7.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H8a.75.75 0 0 1-.75-.75V12ZM8 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H8ZM9.25 10a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H10a.75.75 0 0 1-.75-.75V10ZM10 11.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V12a.75.75 0 0 0-.75-.75H10ZM9.25 14a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H10a.75.75 0 0 1-.75-.75V14ZM12 9.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V10a.75.75 0 0 0-.75-.75H12ZM11.25 12a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H12a.75.75 0 0 1-.75-.75V12ZM12 13.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V14a.75.75 0 0 0-.75-.75H12ZM13.25 10a.75.75 0 0 1 .75-.75h.01a.75.75 0 0 1 .75.75v.01a.75.75 0 0 1-.75.75H14a.75.75 0 0 1-.75-.75V10ZM14 11.25a.75.75 0 0 0-.75.75v.01c0 .414.336.75.75.75h.01a.75.75 0 0 0 .75-.75V12a.75.75 0 0 0-.75-.75H14Z" /><path fill-rule="evenodd" d="M5.75 2a.75.75 0 0 1 .75.75V4h7V2.75a.75.75 0 0 1 1.5 0V4h.25A2.75 2.75 0 0 1 18 6.75v8.5A2.75 2.75 0 0 1 15.25 18H4.75A2.75 2.75 0 0 1 2 15.25v-8.5A2.75 2.75 0 0 1 4.75 4H5V2.75A.75.75 0 0 1 5.75 2Zm-1 5.5c-.69 0-1.25.56-1.25 1.25v6.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-6.5c0-.69-.56-1.25-1.25-1.25H4.75Z" clip-rule="evenodd" /></svg>`,
+                isFutureSubscription ? '_future' : ''
               ),
               this.__renderFaq(
                 'cancel_whats_next',
-                svg`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="text-error flex-shrink-0" style="width: 1.25em; height: 1.25em;"><path d="M3.288 4.818A1.5 1.5 0 0 0 1 6.095v7.81a1.5 1.5 0 0 0 2.288 1.276l6.323-3.905c.155-.096.285-.213.389-.344v2.973a1.5 1.5 0 0 0 2.288 1.276l6.323-3.905a1.5 1.5 0 0 0 0-2.552l-6.323-3.906A1.5 1.5 0 0 0 10 6.095v2.972a1.506 1.506 0 0 0-.389-.343L3.288 4.818Z" /></svg>`
+                svg`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="text-error flex-shrink-0" style="width: 1.25em; height: 1.25em;"><path d="M3.288 4.818A1.5 1.5 0 0 0 1 6.095v7.81a1.5 1.5 0 0 0 2.288 1.276l6.323-3.905c.155-.096.285-.213.389-.344v2.973a1.5 1.5 0 0 0 2.288 1.276l6.323-3.905a1.5 1.5 0 0 0 0-2.552l-6.323-3.906A1.5 1.5 0 0 0 10 6.095v2.972a1.506 1.506 0 0 0-.389-.343L3.288 4.818Z" /></svg>`,
+                isFutureSubscription ? '_future' : ''
               ),
               this.__renderFaq(
                 'cancel_how_to_reactivate',
@@ -189,7 +208,7 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
     return super._sendPatch(edits);
   }
 
-  private __renderFaq(prefix: string, icon: SVGTemplateResult) {
+  private __renderFaq(prefix: string, icon: SVGTemplateResult, textSuffix = '') {
     return html`
       <div
         class="bg-transparent flex leading-xs"
@@ -199,7 +218,11 @@ export class InternalAdminSubscriptionFormStatusActionForm extends InternalForm<
         <p class="grid">
           <foxy-i18n class="leading-m text-s font-medium" infer="" key="${prefix}_title">
           </foxy-i18n>
-          <foxy-i18n class="leading-xs text-secondary text-xs" infer="" key="${prefix}_text">
+          <foxy-i18n
+            class="leading-xs text-secondary text-xs"
+            infer=""
+            key="${prefix}_text${textSuffix}"
+          >
           </foxy-i18n>
         </p>
       </div>
diff --git a/src/elements/public/CouponForm/CouponForm.test.ts b/src/elements/public/CouponForm/CouponForm.test.ts
index 5c2fc0b1..04c2d0cc 100644
--- a/src/elements/public/CouponForm/CouponForm.test.ts
+++ b/src/elements/public/CouponForm/CouponForm.test.ts
@@ -447,7 +447,7 @@ describe('CouponForm', () => {
     control.setValue([{ value: 'a' }, { unit: 'block', value: 'b' }]);
     expect(element).to.have.deep.nested.property('form.product_code_restrictions', 'a,-b');
 
-    element.edit({ product_code_restrictions: '-foo,bar' });
+    element.edit({ product_code_restrictions: ' -foo , bar ' });
     expect(control.getValue()).to.deep.equal([
       { label: 'product-code-restrictions.label_block', value: '-foo' },
       { label: 'product-code-restrictions.label_allow', value: 'bar' },
diff --git a/src/elements/public/CouponForm/CouponForm.ts b/src/elements/public/CouponForm/CouponForm.ts
index 58d9e0f0..d791b35d 100644
--- a/src/elements/public/CouponForm/CouponForm.ts
+++ b/src/elements/public/CouponForm/CouponForm.ts
@@ -148,7 +148,8 @@ export class CouponForm extends Base<Data> {
   private readonly __productCodeRestrictionsGetValue = () => {
     return this.form.product_code_restrictions
       ?.split(',')
-      .filter(v => !!v.trim())
+      .map(v => v.trim())
+      .filter(v => v.length > 0)
       .map(value => ({
         value,
         label: value.startsWith('-')
diff --git a/src/elements/public/PaymentsApiPaymentMethodForm/PaymentsApiPaymentMethodForm.ts b/src/elements/public/PaymentsApiPaymentMethodForm/PaymentsApiPaymentMethodForm.ts
index b7a6ca54..a722f3d8 100644
--- a/src/elements/public/PaymentsApiPaymentMethodForm/PaymentsApiPaymentMethodForm.ts
+++ b/src/elements/public/PaymentsApiPaymentMethodForm/PaymentsApiPaymentMethodForm.ts
@@ -249,11 +249,11 @@ export class PaymentsApiPaymentMethodForm extends Base<Data> {
       : allMethods;
 
     return filteredMethods
-      .sort((a, b) => a[0].localeCompare(b[0], 'en'))
+      .sort((a, b) => a[1].name.localeCompare(b[1].name, 'en'))
       .reduce((groups, [type, helper]) => {
         if (helper.is_deprecated) return groups;
 
-        const firstChar = type.charAt(0).toUpperCase();
+        const firstChar = helper.name.charAt(0).toUpperCase();
         const isSpecialCharacter = !/\w/.test(firstChar);
         const name = isSpecialCharacter ? '#' : firstChar;
         const group = groups.find(group => group.name === name);
diff --git a/src/elements/public/ReportForm/utils.ts b/src/elements/public/ReportForm/utils.ts
index 4121a90b..519c5da9 100644
--- a/src/elements/public/ReportForm/utils.ts
+++ b/src/elements/public/ReportForm/utils.ts
@@ -1,3 +1,5 @@
+import { safeDate } from '../../../utils/safe-date';
+
 type Quarter = [number, number, number];
 type Year = [Quarter, Quarter, Quarter, Quarter];
 type Range = { start: Date; end: Date };
@@ -16,7 +18,7 @@ export function getPreviousQuarter(now = new Date()): Range {
   const previousQuarterYear = now.getFullYear() - (currentQuarter === 0 ? 1 : 0);
 
   const previousQuarterStart = quarters[previousQuarter][0];
-  const start = new Date(previousQuarterYear, previousQuarterStart);
+  const start = safeDate(previousQuarterYear, previousQuarterStart);
 
   const previousQuarterEnd = quarters[previousQuarter][2];
   const end = new Date(new Date(previousQuarterYear, previousQuarterEnd + 1).getTime() - 1);
@@ -29,55 +31,55 @@ export function getCurrentQuarter(now = new Date()): Range {
   const currentQuarter = quarters.findIndex(months => months.includes(currentMonth));
 
   const currentQuarterStart = quarters[currentQuarter][0];
-  const start = new Date(now.getFullYear(), currentQuarterStart);
+  const start = safeDate(now.getFullYear(), currentQuarterStart);
 
   const currentQuarterEnd = quarters[currentQuarter][2];
-  const end = new Date(new Date(now.getFullYear(), currentQuarterEnd + 1).getTime() - 1);
+  const end = new Date(safeDate(now.getFullYear(), currentQuarterEnd + 1).getTime() - 1);
 
   return { start, end };
 }
 
 export function getPreviousMonth(now = new Date()): Range {
-  const start = new Date(now.getFullYear(), now.getMonth() - 1);
-  const end = new Date(new Date(now.getFullYear(), now.getMonth()).getTime() - 1);
+  const start = safeDate(now.getFullYear(), now.getMonth() - 1);
+  const end = new Date(safeDate(now.getFullYear(), now.getMonth()).getTime() - 1);
 
   return { start, end };
 }
 
 export function getCurrentMonth(now = new Date()): Range {
-  const start = new Date(now.getFullYear(), now.getMonth());
-  const end = new Date(new Date(now.getFullYear(), now.getMonth() + 1).getTime() - 1);
+  const start = safeDate(now.getFullYear(), now.getMonth());
+  const end = new Date(safeDate(now.getFullYear(), now.getMonth() + 1).getTime() - 1);
 
   return { start, end };
 }
 
 export function getPreviousYear(now = new Date()): Range {
-  const start = new Date(now.getFullYear() - 1, 0);
-  const end = new Date(new Date(now.getFullYear(), 0).getTime() - 1);
+  const start = safeDate(now.getFullYear() - 1, 0);
+  const end = new Date(safeDate(now.getFullYear(), 0).getTime() - 1);
 
   return { start, end };
 }
 
 export function getCurrentYear(now = new Date()): Range {
-  const start = new Date(now.getFullYear(), 0);
-  const end = new Date(new Date(now.getFullYear() + 1, 0).getTime() - 1);
+  const start = safeDate(now.getFullYear(), 0);
+  const end = new Date(safeDate(now.getFullYear() + 1, 0).getTime() - 1);
 
   return { start, end };
 }
 
 export function getLast365Days(now = new Date()): Range {
-  const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 365);
+  const start = safeDate(now.getFullYear(), now.getMonth(), now.getDate() - 365);
   const end = new Date(
-    new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).getTime() - 1
+    safeDate(now.getFullYear(), now.getMonth(), now.getDate() + 1).getTime() - 1
   );
 
   return { start, end };
 }
 
 export function getLast30Days(now = new Date()): Range {
-  const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 30);
+  const start = safeDate(now.getFullYear(), now.getMonth(), now.getDate() - 30);
   const end = new Date(
-    new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).getTime() - 1
+    safeDate(now.getFullYear(), now.getMonth(), now.getDate() + 1).getTime() - 1
   );
 
   return { start, end };
diff --git a/src/elements/public/Transaction/Transaction.test.ts b/src/elements/public/Transaction/Transaction.test.ts
index f305ac40..98a05549 100644
--- a/src/elements/public/Transaction/Transaction.test.ts
+++ b/src/elements/public/Transaction/Transaction.test.ts
@@ -669,6 +669,7 @@ describe('Transaction', () => {
 
     expect(control).to.exist;
     expect(control).to.have.property('localName', 'foxy-internal-transaction-actions-control');
+    expect(control).to.have.property('currencyDisplay', 'code');
   });
 
   it('renders a post action control for refeeding XML datafeed', async () => {
diff --git a/src/elements/public/Transaction/Transaction.ts b/src/elements/public/Transaction/Transaction.ts
index e92dc3b7..11e17aff 100644
--- a/src/elements/public/Transaction/Transaction.ts
+++ b/src/elements/public/Transaction/Transaction.ts
@@ -228,10 +228,15 @@ export class Transaction extends Base<Data> {
   }
 
   renderHeaderActions(): TemplateResult {
-    const foldersHref = this.__storeLoader?.data?._links['fx:transaction_folders'].href;
+    const store = this.__storeLoader?.data;
+    const foldersHref = store?._links['fx:transaction_folders'].href;
 
     return html`
-      <foxy-internal-transaction-actions-control folders=${ifDefined(foldersHref)} infer="actions">
+      <foxy-internal-transaction-actions-control
+        currency-display=${store?.use_international_currency_symbol ? 'code' : 'symbol'}
+        folders=${ifDefined(foldersHref)}
+        infer="actions"
+      >
       </foxy-internal-transaction-actions-control>
     `;
   }
diff --git a/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.test.ts b/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.test.ts
index acb5ad78..b53e71e1 100644
--- a/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.test.ts
+++ b/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.test.ts
@@ -135,7 +135,7 @@ describe('Transaction', () => {
           href="https://demo.api/hapi/transactions/0"
           @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
         >
-          <foxy-internal-transaction-actions-control infer="actions">
+          <foxy-internal-transaction-actions-control infer="actions" currency-display="code">
           </foxy-internal-transaction-actions-control>
         </foxy-nucleon>
       `);
@@ -150,7 +150,7 @@ describe('Transaction', () => {
 
       expect(control.renderRoot.querySelector('[infer="refund"]')).to.not.exist;
 
-      set(wrapper, 'data._links["fx:refund"]', { href: 'test' });
+      set(wrapper, 'data._links["fx:refund"]', { href: 'test', amount: '12.34' });
       wrapper.data = { ...wrapper.data! };
       await wrapper.requestUpdate();
       await control.requestUpdate();
@@ -160,6 +160,10 @@ describe('Transaction', () => {
       expect(action).to.exist;
       expect(action).to.have.property('localName', 'foxy-internal-post-action-control');
       expect(action).to.have.property('href', 'test');
+      expect(action).to.have.deep.property('messageOptions', {
+        currencyDisplay: 'code',
+        amount: '12.34 USD',
+      });
 
       const refreshMethod = stub(wrapper, 'refresh');
       action?.dispatchEvent(new CustomEvent('success'));
diff --git a/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.ts b/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.ts
index 91051fe7..8b38d78c 100644
--- a/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.ts
+++ b/src/elements/public/Transaction/internal/InternalTransactionActionsControl/InternalTransactionActionsControl.ts
@@ -12,10 +12,13 @@ export class InternalTransactionActionsControl extends InternalControl {
   static get properties(): PropertyDeclarations {
     return {
       ...super.properties,
+      currencyDisplay: { attribute: 'currency-display' },
       folders: {},
     };
   }
 
+  currencyDisplay: string | null = null;
+
   folders: string | null = null;
 
   renderControl(): TemplateResult {
@@ -33,6 +36,13 @@ export class InternalTransactionActionsControl extends InternalControl {
     `;
   }
 
+  private get __refundAmount(): number {
+    const data = (this.nucleon as Transaction | null)?.data;
+    const originalTotal = data?.total_order ?? 0;
+    // @ts-expect-error SDK types do not include amount on fx:refund
+    return parseFloat(data?._links['fx:refund']?.amount ?? originalTotal);
+  }
+
   private __renderSendEmailsAction() {
     return html`
       <foxy-internal-post-action-control
@@ -70,8 +80,14 @@ export class InternalTransactionActionsControl extends InternalControl {
   }
 
   private __renderRefundAction() {
+    const currencyCode = (this.nucleon as Transaction | null)?.data?.currency_code;
+
     return html`
       <foxy-internal-post-action-control
+        message-options=${JSON.stringify({
+          currencyDisplay: this.currencyDisplay,
+          amount: `${this.__refundAmount} ${currencyCode}`,
+        })}
         infer="refund"
         theme="tertiary-inline"
         href=${ifDefined(this.nucleon?.data?._links['fx:refund']?.href)}
diff --git a/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.test.ts b/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.test.ts
index 2ce5fc83..eaf03a1f 100644
--- a/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.test.ts
+++ b/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.test.ts
@@ -11,6 +11,7 @@ import { defaults } from '../../../../../server/hapi/defaults';
 import { links } from '../../../../../server/hapi/links';
 import { FetchEvent } from '../../../NucleonElement/FetchEvent';
 import { createDataset } from '../../../../../server/hapi/createDataset';
+import { set } from 'lodash-es';
 
 describe('Transaction', () => {
   describe('InternalTransactionSummaryControl', () => {
@@ -119,6 +120,48 @@ describe('Transaction', () => {
       });
     });
 
+    it("renders refundable amount if it's different from the total item price", async () => {
+      const router = createRouter();
+      const wrapper = await fixture<Transaction>(html`
+        <foxy-nucleon
+          href="https://demo.api/hapi/transactions/0"
+          @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+        >
+          <foxy-internal-transaction-summary-control infer="summary">
+          </foxy-internal-transaction-summary-control>
+        </foxy-nucleon>
+      `);
+
+      await waitUntil(() => wrapper.in({ idle: 'snapshot' }));
+      const control = wrapper.firstElementChild as InternalTransactionSummaryControl;
+
+      set(wrapper, 'data._links["fx:refund"]', { href: 'test', amount: '12.34' });
+      set(wrapper, 'data.total_order', 23.45);
+      await wrapper.requestUpdate();
+      await control.requestUpdate();
+
+      // @ts-expect-error using private property for testing purposes
+      await waitUntil(() => !!control.__store);
+
+      const label = control.renderRoot.querySelector('foxy-i18n[key="refundable_amount"]')!;
+      const value = label.nextElementSibling!;
+      const note = control.renderRoot.querySelector('foxy-i18n[key="refundable_amount_note"]')!;
+
+      expect(label).to.exist;
+      expect(label).to.have.property('infer', '');
+
+      expect(value).to.exist;
+      expect(value).to.have.property('infer', '');
+      expect(value).to.have.deep.property('options', {
+        currencyDisplay: 'code',
+        signDisplay: 'auto',
+        amount: '12.34 USD',
+      });
+
+      expect(note).to.exist;
+      expect(note).to.have.property('infer', '');
+    });
+
     it('renders total shipping price if shipments are not embedded', async () => {
       const router = createRouter();
       const wrapper = await fixture<Transaction>(html`
diff --git a/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.ts b/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.ts
index 25061ab0..8b067535 100644
--- a/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.ts
+++ b/src/elements/public/Transaction/internal/InternalTransactionSummaryControl/InternalTransactionSummaryControl.ts
@@ -17,6 +17,7 @@ export class InternalTransactionSummaryControl extends InternalControl {
 
     const taxes = data?._embedded?.['fx:applied_taxes'] ?? [];
     const shipments = data._embedded?.['fx:shipments'] ?? [];
+    const refundableAmount = this.__refundableAmount;
 
     return html`
       <foxy-nucleon
@@ -85,10 +86,39 @@ export class InternalTransactionSummaryControl extends InternalControl {
             ${this.__renderPrice(data.total_order)}
           </span>
         </span>
+
+        ${refundableAmount !== data.total_order
+          ? html`
+              <span class="col-span-2 border-t border-dashed border-contrast-20 my-s"></span>
+              <span class="col-span-2 flex justify-end">
+                <span>
+                  <span class="text-xl font-medium leading-xs">
+                    <foxy-i18n infer="" key="refundable_amount"></foxy-i18n>&colon;
+                    ${this.__renderPrice(refundableAmount)}
+                  </span>
+                  <br />
+                  <foxy-i18n
+                    class="inline-block whitespace-normal leading-s text-tertiary"
+                    style="max-width: 48ch"
+                    infer=""
+                    key="refundable_amount_note"
+                  >
+                  </foxy-i18n>
+                </span>
+              </span>
+            `
+          : ''}
       </p>
     `;
   }
 
+  private get __refundableAmount(): number {
+    const data = this.nucleon?.data as Data | undefined;
+    const originalTotal = data?.total_order ?? 0;
+    // @ts-expect-error SDK types do not include amount on fx:refund
+    return parseFloat(data?._links['fx:refund']?.amount ?? originalTotal);
+  }
+
   private get __storeHref() {
     return this.nucleon?.data?._links['fx:store']?.href as string | undefined;
   }
diff --git a/src/elements/public/UserInvitationForm/UserInvitationForm.test.ts b/src/elements/public/UserInvitationForm/UserInvitationForm.test.ts
index dbe30fd3..8629e893 100644
--- a/src/elements/public/UserInvitationForm/UserInvitationForm.test.ts
+++ b/src/elements/public/UserInvitationForm/UserInvitationForm.test.ts
@@ -4,7 +4,7 @@ import type { Data } from './types';
 
 import './index';
 
-import { expect, fixture, html, waitUntil } from '@open-wc/testing';
+import { expect, fixture, html, oneEvent, waitUntil } from '@open-wc/testing';
 import { UserInvitationForm as Form } from './UserInvitationForm';
 import { InternalForm } from '../../internal/InternalForm';
 import { createRouter } from '../../../server';
@@ -54,6 +54,13 @@ describe('UserInvitationForm', () => {
     });
   });
 
+  it('has a reactive property "currentUser"', () => {
+    expect(new Form()).to.have.property('currentUser', null);
+    expect(Form).to.have.deep.nested.property('properties.currentUser', {
+      attribute: 'current-user',
+    });
+  });
+
   it('has a reactive property "layout"', () => {
     expect(new Form()).to.have.property('layout', null);
     expect(Form).to.have.deep.nested.property('properties.layout', {});
@@ -403,6 +410,36 @@ describe('UserInvitationForm', () => {
     expect(action).to.have.attribute('theme', 'error');
   });
 
+  it("renders a special async action for revoking current user's access in snapshot admin layout", async () => {
+    const router = createRouter();
+    const form = await fixture<Form>(html`
+      <foxy-user-invitation-form
+        current-user="https://demo.api/hapi/users/0"
+        layout="admin"
+        href="https://demo.api/hapi/user_invitations/0"
+        @fetch=${(evt: FetchEvent) => router.handleEvent(evt)}
+      >
+      </foxy-user-invitation-form>
+    `);
+
+    await waitUntil(() => !!form.data, undefined, { timeout: 5000 });
+    const action = form.renderRoot.querySelector(
+      'foxy-internal-post-action-control[infer="revoke"]'
+    );
+
+    expect(action).to.exist;
+    expect(action).to.have.attribute('href', form.data!._links['fx:revoke'].href);
+    expect(action).to.have.attribute('theme', 'error');
+    expect(action).to.have.attribute(
+      'message-options',
+      JSON.stringify({ store_domain: 'example', store_name: 'Example Store' })
+    );
+
+    const selfrevokedEvent = oneEvent(form, 'selfrevoked');
+    action!.dispatchEvent(new Event('success'));
+    expect(await selfrevokedEvent).to.exist;
+  });
+
   it('renders async action for resending invitation in snapshot admin layout', async () => {
     const router = createRouter();
     const form = await fixture<Form>(html`
diff --git a/src/elements/public/UserInvitationForm/UserInvitationForm.ts b/src/elements/public/UserInvitationForm/UserInvitationForm.ts
index 4333aff2..e5c9bcaa 100644
--- a/src/elements/public/UserInvitationForm/UserInvitationForm.ts
+++ b/src/elements/public/UserInvitationForm/UserInvitationForm.ts
@@ -21,6 +21,7 @@ export class UserInvitationForm extends Base<Data> {
       ...super.properties,
       getStorePageHref: { attribute: false },
       defaultDomain: { attribute: 'default-domain' },
+      currentUser: { attribute: 'current-user' },
       layout: {},
     };
   }
@@ -62,6 +63,9 @@ export class UserInvitationForm extends Base<Data> {
   /** Default host domain for stores that don't use a custom domain name, e.g. `foxycart.com`. */
   defaultDomain: string | null = null;
 
+  /** Currently logged in user resource URL. Used to display a warning when revoking access. */
+  currentUser: string | null = null;
+
   /** Admin layout will display user info, user layout (default) will display store info. */
   layout: 'admin' | 'user' | null = null;
 
@@ -169,7 +173,7 @@ export class UserInvitationForm extends Base<Data> {
     `;
   }
 
-  private __renderAdminSnapshotState({ first_name, last_name }: Data) {
+  private __renderAdminSnapshotState({ first_name, last_name, store_name, _links }: Data) {
     const hasName = first_name?.trim() || last_name?.trim();
     const nameOptions = { first_name, last_name, context: hasName ? '' : 'empty' };
     const status = this.data?.status;
@@ -237,13 +241,30 @@ export class UserInvitationForm extends Base<Data> {
               hidden.matches('resend', true) &&
               hidden.matches('delete', true)}
             >
-              <foxy-internal-user-invitation-form-async-action
-                infer="revoke"
-                class="flex-1"
-                theme="error"
-                href=${ifDefined(this.data?._links['fx:revoke']?.href)}
-              >
-              </foxy-internal-user-invitation-form-async-action>
+              ${this.currentUser && _links['fx:user'] && this.currentUser === _links['fx:user'].href
+                ? html`
+                    <foxy-internal-post-action-control
+                      message-options=${JSON.stringify({
+                        store_domain: this.__storeDomainGetValue(),
+                        store_name,
+                      })}
+                      infer="revoke"
+                      class="flex-1"
+                      theme="error"
+                      href=${ifDefined(this.data?._links['fx:revoke']?.href)}
+                      @success=${() => this.dispatchEvent(new CustomEvent('selfrevoked'))}
+                    >
+                    </foxy-internal-post-action-control>
+                  `
+                : html`
+                    <foxy-internal-user-invitation-form-async-action
+                      infer="revoke"
+                      class="flex-1"
+                      theme="error"
+                      href=${ifDefined(this.data?._links['fx:revoke']?.href)}
+                    >
+                    </foxy-internal-user-invitation-form-async-action>
+                  `}
 
               <foxy-internal-user-invitation-form-async-action
                 infer="resend"
diff --git a/src/elements/public/UserInvitationForm/index.ts b/src/elements/public/UserInvitationForm/index.ts
index 65e03799..215afe11 100644
--- a/src/elements/public/UserInvitationForm/index.ts
+++ b/src/elements/public/UserInvitationForm/index.ts
@@ -1,3 +1,4 @@
+import '../../internal/InternalPostActionControl/index';
 import '../../internal/InternalSummaryControl/index';
 import '../../internal/InternalDeleteControl/index';
 import '../../internal/InternalTextControl/index';
diff --git a/src/elements/public/WebhookForm/WebhookForm.test.ts b/src/elements/public/WebhookForm/WebhookForm.test.ts
index f9236080..aeef84ab 100644
--- a/src/elements/public/WebhookForm/WebhookForm.test.ts
+++ b/src/elements/public/WebhookForm/WebhookForm.test.ts
@@ -153,6 +153,7 @@ describe('WebhookForm', () => {
       { value: 'transaction', label: 'event_resource_transaction' },
       { value: 'transaction_log', label: 'event_resource_transaction_log' },
       { value: 'customer', label: 'event_resource_customer' },
+      { value: 'changelog', label: 'event_resource_changelog' },
     ];
 
     expect(control).to.exist;
diff --git a/src/elements/public/WebhookForm/WebhookForm.ts b/src/elements/public/WebhookForm/WebhookForm.ts
index d2300436..90349342 100644
--- a/src/elements/public/WebhookForm/WebhookForm.ts
+++ b/src/elements/public/WebhookForm/WebhookForm.ts
@@ -55,6 +55,7 @@ export class WebhookForm extends TranslatableMixin(InternalForm, 'webhook-form')
     { value: 'transaction', label: 'event_resource_transaction' },
     { value: 'transaction_log', label: 'event_resource_transaction_log' },
     { value: 'customer', label: 'event_resource_customer' },
+    { value: 'changelog', label: 'event_resource_changelog' },
   ];
 
   get hiddenSelector(): BooleanSelector {
diff --git a/src/static/translations/admin-subscription-form/en.json b/src/static/translations/admin-subscription-form/en.json
index f753587b..818a8318 100644
--- a/src/static/translations/admin-subscription-form/en.json
+++ b/src/static/translations/admin-subscription-form/en.json
@@ -37,10 +37,13 @@
       "cancel": "Close",
       "cancel_title": "Cancel this subscription",
       "cancel_subtitle": "Cancelling subscriptions in Foxy works by setting the end date. You can select any date in the future, starting from tomorrow.",
+      "cancel_subtitle_future": "Cancelling subscriptions in Foxy works by setting the end date. You can select any date in the future, beginning from the start date.",
       "cancel_why_not_today_title": "Why can't I select today as the end date?",
       "cancel_why_not_today_text": "Same-day cancellations may disrupt billing due to ongoing payment processing. Advance notice ensures that all transactions are completed before cancellation.",
+      "cancel_why_not_today_text_future": "Subscriptions that haven't started yet won't be processed until their start date. Therefore, the earliest end date you can select is the start date.",
       "cancel_whats_next_title": "What happens next?",
       "cancel_whats_next_text": "The subscription will remain active and all payments will be processed as usual until the end date. On the end date, the subscription will be cancelled and no further payments will be taken. If the end date is the same as a normal renewal date, no payments will be taken, but the subscription will simply be cancelled.",
+      "cancel_whats_next_text_future": "The subscription will not be processed until the start date. On the end date, the subscription will be cancelled and no payments will be taken. If the end date is the same as the start date, no payments will be taken, but the subscription will simply be cancelled.",
       "cancel_how_to_reactivate_title": "Can I reactivate this subscription later?",
       "cancel_how_to_reactivate_text": "Yes, you will be able to clear the pending cancellation before the end date, or reactivate the subscription after the end date on this page.",
       "cancel_submit": "Cancel this subscription",
@@ -55,6 +58,7 @@
         "label": "Cancel this subscription",
         "helper_text": "",
         "placeholder": "Select",
+        "option_start_date": "On start date",
         "option_tomorrow": "Tomorrow",
         "option_next_transaction_date": "On next renewal date",
         "option_custom_date": "On specific date"
@@ -1283,6 +1287,8 @@
           "total_tax": "Tax",
           "subtotal": "Subtotal",
           "total": "Total",
+          "refundable_amount": "Refundable",
+          "refundable_amount_note": "The amount that can be refunded is different from the order total above because this transaction has been modified",
           "price": "{{amount, price}}",
           "status_capturing": "Capturing",
           "status_captured": "Captured",
@@ -1291,7 +1297,7 @@
           "status_pending": "Pending",
           "status_completed": "Completed",
           "status_problem": "Problem",
-          "status_pending_fraud_review": "Pending_fraud_review",
+          "status_pending_fraud_review": "Pending fraud review",
           "status_rejected": "Rejected",
           "status_declined": "Declined",
           "status_refunding": "Refunding",
@@ -2103,7 +2109,7 @@
             "button": "Void"
           },
           "refund": {
-            "message_idle": "This action will attempt to refund the full amount of this transaction. Would you like to proceed?",
+            "message_idle": "This action will attempt to refund {{ amount, price }} to the payment method used in this transaction. Would you like to proceed?",
             "message_fail": "Failed to refund this transaction. If you'd like to retry, close this dialog and click the refund button again.",
             "message_done": "Transaction was refunded successfully. You can close this dialog now.",
             "button_close": "Close",
diff --git a/src/static/translations/coupon-form/en.json b/src/static/translations/coupon-form/en.json
index a2b62598..5a1d9e60 100644
--- a/src/static/translations/coupon-form/en.json
+++ b/src/static/translations/coupon-form/en.json
@@ -252,7 +252,7 @@
               "status_pending": "Pending",
               "status_completed": "Completed",
               "status_problem": "Problem",
-              "status_pending_fraud_review": "Pending_fraud_review",
+              "status_pending_fraud_review": "Pending fraud review",
               "status_rejected": "Rejected",
               "status_declined": "Declined",
               "status_refunding": "Refunding",
diff --git a/src/static/translations/customer-portal/de.json b/src/static/translations/customer-portal/de.json
index b7d1e9e9..ad9bd0d6 100644
--- a/src/static/translations/customer-portal/de.json
+++ b/src/static/translations/customer-portal/de.json
@@ -1086,7 +1086,7 @@
             "status_pending": "Ausstehend",
             "status_completed": "Vollendet",
             "status_problem": "Problem",
-            "status_pending_fraud_review": "Pending_fraud_review",
+            "status_pending_fraud_review": "Ausstehende Betrugsüberprüfung",
             "status_rejected": "Abgelehnt",
             "status_declined": "Abgelehnt",
             "status_refunding": "Rückerstattung",
diff --git a/src/static/translations/customer-portal/en.json b/src/static/translations/customer-portal/en.json
index 02ee4078..472df910 100644
--- a/src/static/translations/customer-portal/en.json
+++ b/src/static/translations/customer-portal/en.json
@@ -1086,7 +1086,7 @@
             "status_pending": "Pending",
             "status_completed": "Completed",
             "status_problem": "Problem",
-            "status_pending_fraud_review": "Pending_fraud_review",
+            "status_pending_fraud_review": "Pending fraud review",
             "status_rejected": "Rejected",
             "status_declined": "Declined",
             "status_refunding": "Refunding",
diff --git a/src/static/translations/customer-portal/sv.json b/src/static/translations/customer-portal/sv.json
index 3bc4504b..f4d42e59 100644
--- a/src/static/translations/customer-portal/sv.json
+++ b/src/static/translations/customer-portal/sv.json
@@ -1086,7 +1086,7 @@
             "status_pending": "I väntan på",
             "status_completed": "Avslutad",
             "status_problem": "Problem",
-            "status_pending_fraud_review": "Pending_fraud_review",
+            "status_pending_fraud_review": "Väntar på bedrägeriskontroll",
             "status_rejected": "avvisade",
             "status_declined": "Tackade nej",
             "status_refunding": "Återbetalning",
diff --git a/src/static/translations/customer/en.json b/src/static/translations/customer/en.json
index 487c4b22..d6cff23e 100644
--- a/src/static/translations/customer/en.json
+++ b/src/static/translations/customer/en.json
@@ -1271,7 +1271,7 @@
           "status_pending": "Pending",
           "status_completed": "Completed",
           "status_problem": "Problem",
-          "status_pending_fraud_review": "Pending_fraud_review",
+          "status_pending_fraud_review": "Pending fraud review",
           "status_rejected": "Rejected",
           "status_declined": "Declined",
           "status_refunding": "Refunding",
diff --git a/src/static/translations/subscription-form/en.json b/src/static/translations/subscription-form/en.json
index 23d7ee55..67f4e585 100644
--- a/src/static/translations/subscription-form/en.json
+++ b/src/static/translations/subscription-form/en.json
@@ -195,7 +195,7 @@
         "status_pending": "Pending",
         "status_completed": "Completed",
         "status_problem": "Problem",
-        "status_pending_fraud_review": "Pending_fraud_review",
+        "status_pending_fraud_review": "Pending fraud review",
         "status_rejected": "Rejected",
         "status_declined": "Declined",
         "status_refunding": "Refunding",
diff --git a/src/static/translations/transaction-card/en.json b/src/static/translations/transaction-card/en.json
index 2a3df320..a4aa55b7 100644
--- a/src/static/translations/transaction-card/en.json
+++ b/src/static/translations/transaction-card/en.json
@@ -13,7 +13,7 @@
   "status_pending": "Pending",
   "status_completed": "Completed",
   "status_problem": "Problem",
-  "status_pending_fraud_review": "Pending_fraud_review",
+  "status_pending_fraud_review": "Pending fraud review",
   "status_rejected": "Rejected",
   "status_declined": "Declined",
   "status_refunding": "Refunding",
diff --git a/src/static/translations/transaction/en.json b/src/static/translations/transaction/en.json
index 82350e0e..2f471734 100644
--- a/src/static/translations/transaction/en.json
+++ b/src/static/translations/transaction/en.json
@@ -920,6 +920,8 @@
     "total_tax": "Tax",
     "subtotal": "Subtotal",
     "total": "Total",
+    "refundable_amount": "Refundable",
+    "refundable_amount_note": "The amount that can be refunded is different from the order total above because this transaction has been modified",
     "price": "{{amount, price}}",
     "status_capturing": "Capturing",
     "status_captured": "Captured",
@@ -928,7 +930,7 @@
     "status_pending": "Pending",
     "status_completed": "Completed",
     "status_problem": "Problem",
-    "status_pending_fraud_review": "Pending_fraud_review",
+    "status_pending_fraud_review": "Pending fraud review",
     "status_rejected": "Rejected",
     "status_declined": "Declined",
     "status_refunding": "Refunding",
@@ -1740,7 +1742,7 @@
       "button": "Void"
     },
     "refund": {
-      "message_idle": "This action will attempt to refund the full amount of this transaction. Would you like to proceed?",
+      "message_idle": "This action will attempt to refund {{ amount, price }} to the payment method used in this transaction. Would you like to proceed?",
       "message_fail": "Failed to refund this transaction. If you'd like to retry, close this dialog and click the refund button again.",
       "message_done": "Transaction was refunded successfully. You can close this dialog now.",
       "button_close": "Close",
diff --git a/src/static/translations/user-invitation-form/en.json b/src/static/translations/user-invitation-form/en.json
index d2dc8c36..f7455dcb 100644
--- a/src/static/translations/user-invitation-form/en.json
+++ b/src/static/translations/user-invitation-form/en.json
@@ -32,7 +32,16 @@
   "revoke": {
     "idle": "Revoke access",
     "busy": "Revoking...",
-    "fail": "Failed to revoke"
+    "fail": "Failed to revoke",
+    "message_idle": "You are about to remove your own access to {{ store_name }} ({{ store_domain }}). Are you sure you want to proceed? If you need access to this store again in the future, you will need to be re-invited by another user of the store.",
+    "message_fail": "Failed to revoke access. If you'd like to retry, close this dialog and click the revoke button again.",
+    "message_done": "Your access was revoked successfully. Close this dialog to continue.",
+    "button_close": "Close",
+    "button_confirm": "Leave this store",
+    "button_cancel": "Cancel",
+    "loading_busy": "Processing",
+    "header": "Confirmation Required",
+    "button": "Revoke access"
   },
   "resend": {
     "idle": "Resend invitation",
diff --git a/src/static/translations/webhook-form/en.json b/src/static/translations/webhook-form/en.json
index 4034e6da..f7852047 100644
--- a/src/static/translations/webhook-form/en.json
+++ b/src/static/translations/webhook-form/en.json
@@ -9,6 +9,7 @@
     "subtitle_transaction_log": "Transaction log webhook",
     "subtitle_subscription": "Subscription webhook",
     "subtitle_customer": "Customer webhook",
+    "subtitle_changelog": "Changelog webhook",
     "copy-id": {
       "failed_to_copy": "Failed to copy",
       "click_to_copy": "Copy ID",
@@ -50,7 +51,8 @@
       "event_resource_transaction_log": "Transaction log",
       "event_resource_subscription": "Subscription",
       "event_resource_transaction": "Transaction",
-      "event_resource_customer": "Customer"
+      "event_resource_customer": "Customer",
+      "event_resource_changelog": "Changelog"
     },
     "url": {
       "label": "Endpoint",
diff --git a/src/utils/parse-date.ts b/src/utils/parse-date.ts
index 2e76be60..83588983 100644
--- a/src/utils/parse-date.ts
+++ b/src/utils/parse-date.ts
@@ -1,6 +1,8 @@
+import { safeDate } from './safe-date';
+
 export function parseDate(strDate: string): Date | null {
   if (strDate === '0000-00-00') return null;
   const [year, month, day] = strDate.split('-').map(v => parseInt(v, 10));
   if ([year, month, day].some(v => typeof v !== 'number' || isNaN(v))) return null;
-  return new Date(year, month - 1, day);
+  return safeDate(year, month - 1, day);
 }
diff --git a/src/utils/safe-date.ts b/src/utils/safe-date.ts
new file mode 100644
index 00000000..36d1e42e
--- /dev/null
+++ b/src/utils/safe-date.ts
@@ -0,0 +1,8 @@
+export function safeDate(year: number, month: number, day?: number): Date {
+  // 0-99 map to 1900-1999 in JS Date, so we need to use
+  // setFullYear to set the correct year.
+  const date = new Date();
+  date.setFullYear(year, month, day);
+  date.setHours(0, 0, 0, 0);
+  return date;
+}