From 870086be46db41a1e3199fecc198395c29b91c24 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Fri, 18 Oct 2024 11:20:08 +0100
Subject: [PATCH] Gate expiry support on the front end (#6599)

---
 frontend/app/src/components/Hoverable.svelte  |   2 +-
 .../home/ChannelOrCommunityMembers.svelte     |   4 +
 .../home/ChannelOrCommunitySummary.svelte     |   2 +-
 .../app/src/components/home/ChatList.svelte   |   2 +-
 .../src/components/home/CurrentChat.svelte    |   4 +-
 .../home/CurrentChatMessages.svelte           |   4 +-
 .../src/components/home/DurationPicker.svelte |  47 +++--
 .../app/src/components/home/Footer.svelte     |   2 +
 frontend/app/src/components/home/Home.svelte  |  16 +-
 .../src/components/home/MessageEntry.svelte   |   5 +-
 .../src/components/home/NoChatSelected.svelte |   7 +-
 .../src/components/home/PreviewFooter.svelte  |  25 ++-
 .../components/home/RecommendedGroup.svelte   |   4 +-
 .../app/src/components/home/RightPanel.svelte |  32 ++--
 .../components/home/VisibilityControl.svelte  |   6 +-
 .../home/access/AccessGateBuilder.svelte      | 114 +++++++++---
 .../home/access/AccessGateCheckFailed.svelte  |   9 +-
 .../home/access/AccessGateControl.svelte      |  16 +-
 .../home/access/AccessGateEvaluator.svelte    |  85 ++++++---
 .../home/access/AccessGateExpiry.svelte       |  57 ++++++
 .../home/access/AccessGateIcon.svelte         |  66 +++++--
 .../home/access/AccessGateIconsForChat.svelte |   9 +-
 .../home/access/AccessGateSummary.svelte      |  12 +-
 .../access/CredentialGateEvaluator.svelte     |   9 +-
 .../home/access/PaymentGateEvaluator.svelte   |  39 ++++-
 .../access/UniqueHumanGateEvaluator.svelte    |   9 +
 .../components/home/addgroup/NewGroup.svelte  |   7 +-
 .../home/communities/PreviewWrapper.svelte    |  30 ++--
 .../communities/details/ChannelCard.svelte    |   2 +-
 .../details/CommunityDetails.svelte           |  17 +-
 .../details/CommunitySummary.svelte           |   2 +-
 .../home/communities/edit/Edit.svelte         |   9 +-
 .../communities/explore/CommunityCard.svelte  |   6 +-
 .../home/communities/explore/Explore.svelte   |   2 +-
 .../home/groupdetails/BlockedUser.svelte      |   3 +-
 .../home/groupdetails/GroupDetailsBody.svelte |  18 +-
 .../home/groupdetails/InvitedUser.svelte      |   3 +-
 .../home/groupdetails/Member.svelte           |   1 +
 .../home/groupdetails/Members.svelte          | 129 ++++++++++----
 .../components/home/groupdetails/User.svelte  |   1 +
 .../src/components/home/thread/Thread.svelte  |   1 +
 frontend/app/src/i18n/cn.json                 |  10 ++
 frontend/app/src/i18n/de.json                 |  10 ++
 frontend/app/src/i18n/en.json                 |  10 ++
 frontend/app/src/i18n/es.json                 |  10 ++
 frontend/app/src/i18n/fa.json                 |  10 ++
 frontend/app/src/i18n/fr.json                 |  10 ++
 frontend/app/src/i18n/hi.json                 |  10 ++
 frontend/app/src/i18n/it.json                 |  10 ++
 frontend/app/src/i18n/iw.json                 |  10 ++
 frontend/app/src/i18n/jp.json                 |  10 ++
 frontend/app/src/i18n/pl.json                 |  10 ++
 frontend/app/src/i18n/ru.json                 |  10 ++
 frontend/app/src/i18n/uk.json                 |  10 ++
 frontend/app/src/i18n/vi.json                 |  10 ++
 frontend/app/src/stores/community.ts          |   3 +-
 frontend/app/src/utils/time.ts                |  21 +++
 .../src/services/candidService.ts             |   9 +-
 .../src/services/common/chatMappers.ts        |  21 ++-
 .../src/services/common/chatMappersV2.ts      |  65 +++++--
 .../services/common/publicSummaryMapperV2.ts  |   7 +-
 .../services/community/community.client.ts    |  40 ++---
 .../src/services/community/mappersV2.ts       |  40 +++--
 .../src/services/group/group.client.ts        |  29 ++-
 .../src/services/group/mappersV2.ts           |  71 +++++---
 .../src/services/groupIndex/mappers.ts        |   7 +-
 .../localUserIndex/localUserIndex.client.ts   |   5 +-
 .../src/services/openchatAgent.ts             |   8 +-
 .../services/proposalsBot/candid/types.d.ts   |   1 +
 .../services/storageBucket/candid/types.d.ts  |   1 +
 .../services/storageIndex/candid/types.d.ts   |   1 +
 .../services/translations/candid/types.d.ts   |   1 +
 .../src/services/user/candid/types.d.ts       |   1 +
 .../src/services/user/mappers.ts              |   1 +
 .../src/services/user/user.client.ts          |   8 +-
 frontend/openchat-agent/src/utils/caching.ts  |  31 ++--
 frontend/openchat-agent/src/utils/chat.ts     |  38 ++--
 .../openchat-agent/src/utils/community.ts     |  14 +-
 frontend/openchat-client/src/openchat.ts      | 165 ++++++++++++------
 frontend/openchat-client/src/stores/chat.ts   |   8 +
 .../openchat-client/src/stores/community.ts   |   6 +
 .../src/stores/localChatSummaryUpdates.ts     |   2 +-
 .../openchat-client/src/utils/chat.spec.ts    |   3 +-
 frontend/openchat-client/src/utils/chat.ts    |  19 +-
 .../openchat-client/src/utils/community.ts    |   4 +
 frontend/openchat-client/src/utils/time.ts    |  14 +-
 frontend/openchat-shared/src/constants.ts     |   2 +
 frontend/openchat-shared/src/domain/access.ts |  10 +-
 .../openchat-shared/src/domain/chat/chat.ts   |  48 +++--
 .../src/domain/community/index.ts             |  24 +--
 .../openchat-shared/src/domain/permission.ts  |   1 +
 .../src/domain/search/search.ts               |   4 +-
 frontend/openchat-shared/src/domain/worker.ts |   6 +-
 frontend/openchat-worker/src/worker.ts        |   4 +-
 94 files changed, 1253 insertions(+), 448 deletions(-)
 create mode 100644 frontend/app/src/components/home/access/AccessGateExpiry.svelte
 create mode 100644 frontend/app/src/utils/time.ts

diff --git a/frontend/app/src/components/Hoverable.svelte b/frontend/app/src/components/Hoverable.svelte
index 9352787da4..9f0ac5d6b9 100644
--- a/frontend/app/src/components/Hoverable.svelte
+++ b/frontend/app/src/components/Hoverable.svelte
@@ -134,7 +134,7 @@
 <style lang="scss">
     .noselect {
         @include no_user_select();
-        display: inline-block;
+        display: inline-flex;
 
         &.fill {
             width: 100%;
diff --git a/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte b/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
index b8d5c9cec4..f1e089ae15 100644
--- a/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
+++ b/frontend/app/src/components/home/ChannelOrCommunityMembers.svelte
@@ -18,9 +18,11 @@
     $: currentChatMembers = client.currentChatMembers;
     $: currentChatInvited = client.currentChatInvitedUsers;
     $: currentChatBlocked = client.currentChatBlockedUsers;
+    $: currentChatLapsed = client.currentChatLapsedMembers;
     $: currentCommunityMembers = client.currentCommunityMembers;
     $: currentCommunityInvited = client.currentCommunityInvitedUsers;
     $: currentCommunityBlocked = client.currentCommunityBlockedUsers;
+    $: currentCommunityLapsed = client.currentCommunityLapsedMembers;
     $: canInvite =
         selectedTab === "community"
             ? client.canInviteUsers(community.id)
@@ -103,6 +105,7 @@
         invited={$currentCommunityInvited}
         members={[...$currentCommunityMembers.values()]}
         blocked={$currentCommunityBlocked}
+        lapsed={$currentCommunityLapsed}
         on:close
         on:blockUser={onBlockCommunityUser}
         on:unblockUser={onUnblockCommunityUser}
@@ -120,6 +123,7 @@
         invited={$currentChatInvited}
         members={$currentChatMembers}
         blocked={$currentChatBlocked}
+        lapsed={$currentChatLapsed}
         on:close
         on:blockUser={onBlockGroupUser}
         on:unblockUser={onUnblockGroupUser}
diff --git a/frontend/app/src/components/home/ChannelOrCommunitySummary.svelte b/frontend/app/src/components/home/ChannelOrCommunitySummary.svelte
index 48eeae9784..97f829abe7 100644
--- a/frontend/app/src/components/home/ChannelOrCommunitySummary.svelte
+++ b/frontend/app/src/components/home/ChannelOrCommunitySummary.svelte
@@ -69,7 +69,7 @@
             banner={community.banner}
             avatar={community.avatar}
             memberCount={community.memberCount}
-            gate={community.gate}
+            gateConfig={community.gateConfig}
             language={community.primaryLanguage}
             flags={0}
             channelCount={0}
diff --git a/frontend/app/src/components/home/ChatList.svelte b/frontend/app/src/components/home/ChatList.svelte
index aeaafac86c..d6b684bb71 100644
--- a/frontend/app/src/components/home/ChatList.svelte
+++ b/frontend/app/src/components/home/ChatList.svelte
@@ -179,7 +179,7 @@
 
     beforeUpdate(() => {
         if (previousScope === $chatListScope && view !== "chats" && previousView === "chats") {
-            chatsScrollTop = chatListElement.scrollTop;
+            chatsScrollTop = chatListElement?.scrollTop;
         }
     });
 
diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 2290541f0f..a24156e5f1 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -86,6 +86,7 @@
     $: communities = client.communities;
     $: canSendAny = client.canSendMessage(chat.id, "message");
     $: preview = client.isPreviewing(chat.id);
+    $: lapsed = client.isLapsed(chat.id);
     $: canPin = client.canPinMessages(chat.id);
     $: canBlockUsers = client.canBlockUsers(chat.id);
     $: canDelete = client.canDeleteOtherUsersMessages(chat.id);
@@ -130,7 +131,7 @@
     }
 
     function getUnreadMessageCount(chat: ChatSummary): number {
-        if (client.isPreviewing(chat.id)) return 0;
+        if (client.isPreviewing(chat.id) || client.isLapsed(chat.id)) return 0;
 
         return messagesRead.unreadMessageCount(chat.id, chat.latestMessage?.event.messageIndex);
     }
@@ -410,6 +411,7 @@
             mode={"message"}
             {joining}
             {preview}
+            {lapsed}
             {blocked}
             externalContent={externalUrl !== undefined}
             on:joinGroup
diff --git a/frontend/app/src/components/home/CurrentChatMessages.svelte b/frontend/app/src/components/home/CurrentChatMessages.svelte
index 1ef7d2effc..a039824b64 100644
--- a/frontend/app/src/components/home/CurrentChatMessages.svelte
+++ b/frontend/app/src/components/home/CurrentChatMessages.svelte
@@ -142,8 +142,8 @@
 
     $: privateCommunityPreview =
         $selectedCommunity !== undefined &&
-        $selectedCommunity.membership.role === "none" &&
-        (!$selectedCommunity.public || $selectedCommunity.gate.kind !== "no_gate");
+        ($selectedCommunity.membership.role === "none" || $selectedCommunity.membership.lapsed) &&
+        (!$selectedCommunity.public || $selectedCommunity.gateConfig.gate.kind !== "no_gate");
 
     $: privatePreview = privateCommunityPreview || privateChatPreview;
     $: isEmptyChat = chat.latestEventIndex <= 0 || privatePreview;
diff --git a/frontend/app/src/components/home/DurationPicker.svelte b/frontend/app/src/components/home/DurationPicker.svelte
index 21ca6063ca..eb87e0a819 100644
--- a/frontend/app/src/components/home/DurationPicker.svelte
+++ b/frontend/app/src/components/home/DurationPicker.svelte
@@ -4,31 +4,48 @@
     import Select from "../Select.svelte";
     import { _ } from "svelte-i18n";
     import type { OpenChat } from "openchat-client";
+    import { msToDays, msToHours, msToMinutes, msToMonths, msToWeeks } from "../../utils/time";
 
     const ONE_MINUTE = 1000 * 60;
     const ONE_HOUR = ONE_MINUTE * 60;
     const ONE_DAY = ONE_HOUR * 24;
+    const ONE_WEEK = ONE_DAY * 7;
+    const ONE_MONTH = ONE_WEEK * 4;
     const client = getContext<OpenChat>("client");
 
+    type DurationUnit = "minutes" | "hours" | "days" | "weeks" | "months";
+
     export let valid = true;
     export let milliseconds: bigint = BigInt(ONE_HOUR);
     export let disabled = false;
+    export let unitFilter = (_: DurationUnit) => true;
 
     let initialised = false;
     let amount: string;
-    let unit: "minutes" | "hours" | "days";
+    let unit: DurationUnit;
+
+    $: allUnits = ["minutes", "hours", "days", "weeks", "months"] as DurationUnit[];
+    $: supportedDurations = allUnits.filter(unitFilter);
 
     onMount(() => {
-        const { days, hours, minutes } = client.durationFromMilliseconds(Number(milliseconds));
-        if (days > 0) {
-            amount = days.toString();
-            unit = "days";
+        const duration = client.durationFromMilliseconds(Number(milliseconds));
+        const { days, hours, minutes, weeks, months, total } = duration;
+
+        if (minutes > 0) {
+            amount = msToMinutes(total).toString();
+            unit = "minutes";
         } else if (hours > 0) {
-            amount = hours.toString();
+            amount = msToHours(total).toString();
             unit = "hours";
-        } else if (minutes > 0) {
-            amount = minutes.toString();
-            unit = "minutes";
+        } else if (days > 0) {
+            amount = msToDays(total).toString();
+            unit = "days";
+        } else if (weeks > 0) {
+            amount = msToWeeks(total).toString();
+            unit = "weeks";
+        } else if (months > 0) {
+            amount = msToMonths(total).toString();
+            unit = "months";
         }
         initialised = true;
     });
@@ -42,6 +59,12 @@
         }
         valid = true;
         switch (unit) {
+            case "months":
+                milliseconds = BigInt(ONE_MONTH * ttlNum);
+                break;
+            case "weeks":
+                milliseconds = BigInt(ONE_WEEK * ttlNum);
+                break;
             case "minutes":
                 milliseconds = BigInt(ONE_MINUTE * ttlNum);
                 break;
@@ -66,9 +89,9 @@
 
     <div class="units">
         <Select {disabled} margin={false} on:change={() => updateAmount(amount)} bind:value={unit}>
-            <option value={"minutes"}>{$_("minutes")}</option>
-            <option value={"hours"}>{$_("hours")}</option>
-            <option value={"days"}>{$_("days")}</option>
+            {#each supportedDurations as duration}
+                <option value={duration}>{$_(duration)}</option>
+            {/each}
         </Select>
     </div>
 </div>
diff --git a/frontend/app/src/components/home/Footer.svelte b/frontend/app/src/components/home/Footer.svelte
index c111c76f8c..1ff3127f00 100644
--- a/frontend/app/src/components/home/Footer.svelte
+++ b/frontend/app/src/components/home/Footer.svelte
@@ -28,6 +28,7 @@
 
     export let blocked: boolean;
     export let preview: boolean;
+    export let lapsed: boolean;
     export let joining: MultiUserChat | undefined;
     export let chat: ChatSummary;
     export let attachment: AttachmentContent | undefined;
@@ -140,6 +141,7 @@
         {externalContent}
         {mode}
         {preview}
+        {lapsed}
         {blocked}
         {joining}
         {attachment}
diff --git a/frontend/app/src/components/home/Home.svelte b/frontend/app/src/components/home/Home.svelte
index 69f8628507..52cee23a0a 100644
--- a/frontend/app/src/components/home/Home.svelte
+++ b/frontend/app/src/components/home/Home.svelte
@@ -30,7 +30,7 @@
         UpdatedRules,
         ResourceKey,
         NervousSystemDetails,
-        AccessGateWithLevel,
+        EnhancedAccessGate,
         GateCheckSucceeded,
     } from "openchat-client";
     import {
@@ -156,7 +156,7 @@
         | { kind: "no_access" }
         | { kind: "new_group"; embeddedContent: boolean; candidate: CandidateGroupChat }
         | { kind: "wallet" }
-        | { kind: "gate_check_failed"; gates: AccessGateWithLevel[] }
+        | { kind: "gate_check_failed"; gates: EnhancedAccessGate[] }
         | { kind: "hall_of_fame" }
         | { kind: "edit_community"; community: CommunitySummary; communityRules: Rules }
         | { kind: "make_proposal"; chat: MultiUserChat; nervousSystem: NervousSystemDetails }
@@ -169,7 +169,7 @@
               kind: "evaluating_access_gates";
               group: MultiUserChat;
               select: boolean;
-              gates: AccessGateWithLevel[];
+              gates: EnhancedAccessGate[];
               level: Level;
           };
 
@@ -841,7 +841,7 @@
         // that we are actually already a member of this group, so we should double check here
         // that we actually *need* to join the group
         let chat = $chatSummariesStore.get(group.id);
-        if (chat === undefined || chat.membership.role === "none") {
+        if (chat === undefined || chat.membership.role === "none" || client.isLapsed(chat.id)) {
             doJoinGroup(group, select, undefined);
         }
     }
@@ -869,6 +869,7 @@
     ): Promise<void> {
         joining = group;
         const credentials = gateCheck?.credentials ?? [];
+        const paymentApprovals = gateCheck?.paymentApprovals ?? new Map();
 
         if (gateCheck === undefined) {
             const gates = client.accessGatesForChat(group, true);
@@ -893,7 +894,7 @@
         }
 
         return client
-            .joinGroup(group, credentials)
+            .joinGroup(group, credentials, paymentApprovals)
             .then((resp) => {
                 if (resp.kind === "blocked") {
                     toastStore.showFailureToast(i18nKey("youreBlocked"));
@@ -1027,7 +1028,7 @@
                     threadPermissions: undefined,
                 },
                 rules: { ...defaultChatRules(level), newVersion: false },
-                gate: { kind: "no_gate" },
+                gateConfig: { gate: { kind: "no_gate" }, expiry: undefined },
                 level,
                 membership: {
                     ...nullMembership(),
@@ -1060,7 +1061,7 @@
                     blobUrl: chat.blobUrl,
                     blobData: chat.blobData,
                 },
-                gate: chat.gate,
+                gateConfig: chat.gateConfig,
                 level,
                 membership: chat.membership,
                 eventsTTL: chat.eventsTTL,
@@ -1292,7 +1293,6 @@
             <GateCheckFailed on:close={closeModal} gates={modal.gates} />
         {:else if modal.kind === "evaluating_access_gates"}
             <AccessGateEvaluator
-                level={modal.level}
                 gates={modal.gates}
                 on:close={closeModal}
                 on:success={accessGatesEvaluated} />
diff --git a/frontend/app/src/components/home/MessageEntry.svelte b/frontend/app/src/components/home/MessageEntry.svelte
index 0b6f86d9d5..1b04fd9158 100644
--- a/frontend/app/src/components/home/MessageEntry.svelte
+++ b/frontend/app/src/components/home/MessageEntry.svelte
@@ -45,6 +45,7 @@
     export let chat: ChatSummary;
     export let blocked: boolean;
     export let preview: boolean;
+    export let lapsed: boolean;
     export let messageAction: MessageAction = undefined;
     export let joining: MultiUserChat | undefined;
     export let attachment: AttachmentContent | undefined;
@@ -558,8 +559,8 @@
         <div class="blocked">
             {$_("userIsBlocked")}
         </div>
-    {:else if preview && chat.kind !== "direct_chat"}
-        <PreviewFooter {joining} {chat} on:joinGroup on:upgrade />
+    {:else if (preview || lapsed) && chat.kind !== "direct_chat"}
+        <PreviewFooter {lapsed} {joining} {chat} on:joinGroup on:upgrade />
     {:else if externalContent}
         <div class="disclaimer">
             <Alert size={$iconSize} color={"var(--warn"} />
diff --git a/frontend/app/src/components/home/NoChatSelected.svelte b/frontend/app/src/components/home/NoChatSelected.svelte
index 479072b246..922d92de2d 100644
--- a/frontend/app/src/components/home/NoChatSelected.svelte
+++ b/frontend/app/src/components/home/NoChatSelected.svelte
@@ -13,8 +13,9 @@
 
     $: chatListScope = client.chatListScope;
     $: selectedCommunity = client.selectedCommunity;
-    $: previewingCommunity = $selectedCommunity?.membership.role === "none";
-    $: locked = isLocked($selectedCommunity?.gate);
+    $: previewingCommunity =
+        $selectedCommunity?.membership.role === "none" || $selectedCommunity?.membership.lapsed;
+    $: locked = isLocked($selectedCommunity?.gateConfig?.gate);
 
     $: [title, message] = getMessageForScope($chatListScope.kind);
 
@@ -54,7 +55,7 @@
                 language={$selectedCommunity.primaryLanguage}
                 flags={0}
                 header
-                gate={$selectedCommunity.gate}
+                gateConfig={$selectedCommunity.gateConfig}
                 avatar={$selectedCommunity.avatar} />
             <div class="join">
                 <Button
diff --git a/frontend/app/src/components/home/PreviewFooter.svelte b/frontend/app/src/components/home/PreviewFooter.svelte
index 7e7dc18882..8080f5ac7d 100644
--- a/frontend/app/src/components/home/PreviewFooter.svelte
+++ b/frontend/app/src/components/home/PreviewFooter.svelte
@@ -14,11 +14,13 @@
 
     export let chat: MultiUserChat;
     export let joining: MultiUserChat | undefined;
+    export let lapsed: boolean;
 
     $: platformModerator = client.platformModerator;
     $: isFrozen = client.isFrozen(chat.id);
     $: selectedCommunity = client.selectedCommunity;
-    $: previewingCommunity = $selectedCommunity?.membership.role === "none";
+    $: previewingCommunity =
+        $selectedCommunity?.membership.role === "none" || $selectedCommunity?.membership.lapsed;
     $: gates = client.accessGatesForChat(chat);
     $: locked = gates.some((g) => isLocked(g));
 
@@ -70,6 +72,11 @@
     <div class="gate">
         <AccessGateIconsForChat {gates} />
     </div>
+    {#if lapsed}
+        <div class="lapsed">
+            <Translatable resourceKey={i18nKey("access.lapsed.label")} />
+        </div>
+    {/if}
     {#if $platformModerator}
         {#if isFrozen}
             <Button loading={freezingInProgress} secondary small on:click={unfreezeGroup}>
@@ -81,9 +88,11 @@
             </Button>
         {/if}
     {/if}
-    <Button secondary small on:click={cancelPreview}>
-        <Translatable resourceKey={i18nKey("leave")} />
-    </Button>
+    {#if !lapsed}
+        <Button secondary small on:click={cancelPreview}>
+            <Translatable resourceKey={i18nKey("leave")} />
+        </Button>
+    {/if}
     <Button
         loading={joining !== undefined}
         disabled={locked || joining !== undefined}
@@ -92,7 +101,9 @@
         <Translatable
             resourceKey={locked
                 ? i18nKey("access.lockedGate", undefined, chat.level, true)
-                : i18nKey("joinGroup", undefined, chat.level, true)} />
+                : lapsed
+                  ? i18nKey("access.lapsed.rejoin", undefined, chat.level, true)
+                  : i18nKey("joinGroup", undefined, chat.level, true)} />
     </Button>
 </div>
 
@@ -114,4 +125,8 @@
             left: 0;
         }
     }
+
+    .lapsed {
+        @include font(bold, normal, fs-100);
+    }
 </style>
diff --git a/frontend/app/src/components/home/RecommendedGroup.svelte b/frontend/app/src/components/home/RecommendedGroup.svelte
index 6bf9b6c498..35c6cb82ed 100644
--- a/frontend/app/src/components/home/RecommendedGroup.svelte
+++ b/frontend/app/src/components/home/RecommendedGroup.svelte
@@ -32,7 +32,7 @@
     $: chatListScope = client.chatListScope;
     $: chatSummariesStore = client.chatSummariesStore;
     $: member = $chatSummariesStore.has(group.id);
-    $: locked = isLocked(group.gate);
+    $: locked = isLocked(group.gateConfig.gate);
 
     function dismiss({ id }: GroupChatSummary) {
         dispatch("dismissRecommendation", id);
@@ -84,7 +84,7 @@
     </div>
     <Footer align="end">
         <div class="gate">
-            <AccessGateIcon clickable level={group.level} gate={group.gate} />
+            <AccessGateIcon clickable level={group.level} gateConfig={group.gateConfig} />
         </div>
         {#if member}
             <Button tiny on:click={() => leaveGroup(group)}
diff --git a/frontend/app/src/components/home/RightPanel.svelte b/frontend/app/src/components/home/RightPanel.svelte
index 9dceae0796..72876221b9 100644
--- a/frontend/app/src/components/home/RightPanel.svelte
+++ b/frontend/app/src/components/home/RightPanel.svelte
@@ -54,10 +54,12 @@
     $: currentChatMembers = client.currentChatMembers;
     $: currentChatInvited = client.currentChatInvitedUsers;
     $: currentChatBlocked = client.currentChatBlockedUsers;
+    $: currentChatLapsedMembers = client.currentChatLapsedMembers;
     $: currentChatPinnedMessages = client.currentChatPinnedMessages;
     $: currentCommunityMembers = client.currentCommunityMembers;
     $: currentCommunityInvited = client.currentCommunityInvitedUsers;
     $: currentCommunityBlocked = client.currentCommunityBlockedUsers;
+    $: currentCommunityLapsed = client.currentCommunityLapsedMembers;
     $: selectedCommunity = client.selectedCommunity;
     $: eventsStore = client.eventsStore;
     $: userStore = client.userStore;
@@ -148,19 +150,18 @@
                 .then((resp) => {
                     if (resp) {
                         popRightPanelHistory();
-                            if ($multiUserChat?.public ?? false) {
-                                toastStore.showSuccessToast(i18nKey("group.usersInvited"));
-                            }
-
+                        if ($multiUserChat?.public ?? false) {
+                            toastStore.showSuccessToast(i18nKey("group.usersInvited"));
+                        }
                     } else {
                         toastStore.showFailureToast(
-                                i18nKey(
-                                    "group.inviteUsersFailed",
-                                    undefined,
-                                    $multiUserChat.level,
-                                    true,
-                                ),
-                            );
+                            i18nKey(
+                                "group.inviteUsersFailed",
+                                undefined,
+                                $multiUserChat.level,
+                                true,
+                            ),
+                        );
                     }
                 })
                 .catch((err) => {
@@ -462,6 +463,7 @@
                 invited={$currentCommunityInvited}
                 members={[...$currentCommunityMembers.values()]}
                 blocked={$currentCommunityBlocked}
+                lapsed={$currentCommunityLapsed}
                 initialUsergroup={lastState.userGroupId}
                 on:close={popRightPanelHistory}
                 on:blockUser={onBlockCommunityUser}
@@ -470,8 +472,7 @@
                 on:showInviteUsers={showInviteCommunityUsers}
                 on:removeMember={onRemoveCommunityMember}
                 on:changeRole={onChangeCommunityRole}
-                on:cancelInvite={onCancelCommunityInvite}
-                />
+                on:cancelInvite={onCancelCommunityInvite} />
         {/if}
     {:else if lastState.kind === "invite_group_users" && $multiUserChat !== undefined}
         {#if $multiUserChat.kind === "channel" && $selectedCommunity !== undefined}
@@ -505,13 +506,14 @@
             invited={$currentChatInvited}
             members={$currentChatMembers}
             blocked={$currentChatBlocked}
+            lapsed={$currentChatLapsedMembers}
             on:close={popRightPanelHistory}
             on:blockUser={onBlockGroupUser}
             on:unblockUser={onUnblockGroupUser}
             on:chatWith
             on:showInviteUsers={showInviteGroupUsers}
             on:removeMember={onRemoveGroupMember}
-            on:changeRole={onChangeGroupRole} 
+            on:changeRole={onChangeGroupRole}
             on:cancelInvite={onCancelGroupInvite} />
     {:else if lastState.kind === "show_group_members" && $selectedChatId !== undefined && $multiUserChat !== undefined && $multiUserChat.kind === "channel" && $selectedCommunity !== undefined}
         <ChannelOrCommunityMembers
@@ -530,7 +532,7 @@
             on:showInviteGroupUsers={showInviteGroupUsers}
             on:changeGroupRole={onChangeGroupRole}
             on:close={popRightPanelHistory}
-            on:chatWith 
+            on:chatWith
             on:cancelGroupInvite={onCancelGroupInvite}
             on:cancelCommunityInvite={onCancelCommunityInvite} />
     {:else if lastState.kind === "show_pinned" && $selectedChatId !== undefined && ($selectedChatId.kind === "group_chat" || $selectedChatId.kind === "channel") && $multiUserChat !== undefined}
diff --git a/frontend/app/src/components/home/VisibilityControl.svelte b/frontend/app/src/components/home/VisibilityControl.svelte
index 1578c297e3..43fa0bcb86 100644
--- a/frontend/app/src/components/home/VisibilityControl.svelte
+++ b/frontend/app/src/components/home/VisibilityControl.svelte
@@ -33,7 +33,7 @@
         if (
             gateDirty &&
             candidate.kind === "candidate_group_chat" &&
-            candidate.gate.kind !== "no_gate"
+            candidate.gateConfig.gate.kind !== "no_gate"
         ) {
             candidate.messagesVisibleToNonMembers = false;
         }
@@ -46,7 +46,7 @@
         }
         if (candidate.kind === "candidate_group_chat") {
             candidate.messagesVisibleToNonMembers =
-                candidate.public && candidate.gate.kind === "no_gate";
+                candidate.public && candidate.gateConfig.gate.kind === "no_gate";
         }
     }
 
@@ -181,7 +181,7 @@
 {#if !requiresUpgrade}
     <AccessGateControl
         on:updated={gateUpdated}
-        bind:gate={candidate.gate}
+        bind:gateConfig={candidate.gateConfig}
         level={candidate.level}
         bind:valid />
 {/if}
diff --git a/frontend/app/src/components/home/access/AccessGateBuilder.svelte b/frontend/app/src/components/home/access/AccessGateBuilder.svelte
index d94bcc27c6..d8894c92a3 100644
--- a/frontend/app/src/components/home/access/AccessGateBuilder.svelte
+++ b/frontend/app/src/components/home/access/AccessGateBuilder.svelte
@@ -7,6 +7,7 @@
         isLeafGate,
         isCompositeGate,
         OpenChat,
+        type AccessGateConfig,
     } from "openchat-client";
     import ModalContent from "../../ModalContent.svelte";
     import Overlay from "../../Overlay.svelte";
@@ -31,11 +32,14 @@
     import AccessGateIcon from "./AccessGateIcon.svelte";
     import TooltipWrapper from "../../TooltipWrapper.svelte";
     import TooltipPopup from "../../TooltipPopup.svelte";
+    import Checkbox from "../../Checkbox.svelte";
+    import DurationPicker from "../DurationPicker.svelte";
+    import AccessGateExpiry from "./AccessGateExpiry.svelte";
 
     const MAX_GATES = 5;
     const client = getContext<OpenChat>("client");
 
-    export let gate: AccessGate;
+    export let gateConfig: AccessGateConfig;
     export let editable: boolean;
     export let level: Level;
     export let valid: boolean;
@@ -43,42 +47,48 @@
     let gateValidity: boolean[] = [];
     let selectedGateIndex: number | undefined = undefined;
     let gateBindings: GateBinding[] = getGateBindings(level);
+    let evaluationIntervalValid: boolean;
+
     $: nervousSystemLookup = client.nervousSystemLookup;
     $: cryptoLookup = client.cryptoLookup;
     $: nsLedgers = new Set(Object.values($nervousSystemLookup).map((d) => d.ledgerCanisterId));
     $: neuronGateBindings = getNeuronGateBindings($nervousSystemLookup);
     $: paymentGateBindings = getPaymentGateBindings($cryptoLookup, nsLedgers);
     $: balanceGateBindings = getBalanceGateBindings($cryptoLookup);
-    $: canAdd = isLeafGate(gate) || gate.gates.length < MAX_GATES;
+    $: canAdd = isLeafGate(gateConfig.gate) || gateConfig.gate.gates.length < MAX_GATES;
     $: title = !editable ? i18nKey("access.readonlyTitle") : i18nKey("access.title");
 
     $: {
-        valid = gateValidity.every((v) => v);
+        valid =
+            gateValidity.every((v) => v) &&
+            (gateConfig.expiry !== undefined ? !editable || evaluationIntervalValid : true);
     }
 
     function addLeaf() {
         const newGate: AccessGate = { kind: "no_gate" };
-        if (gate.kind === "composite_gate") {
-            gate.gates.push(newGate);
+        if (gateConfig.gate.kind === "composite_gate") {
+            gateConfig.gate.gates.push(newGate);
         } else {
-            gate = {
+            gateConfig.gate = {
                 kind: "composite_gate",
-                gates: [gate, newGate],
+                gates: [gateConfig.gate, newGate],
                 operator: "and",
             };
         }
-        gate = gate;
-        selectedGateIndex = gate.gates.length - 1;
+        gateConfig = gateConfig;
+        if (isCompositeGate(gateConfig.gate)) {
+            selectedGateIndex = gateConfig.gate.gates.length - 1;
+        }
     }
 
     function deleteGate(idx: number) {
-        if (isCompositeGate(gate)) {
-            gate.gates.splice(idx, 1);
+        if (isCompositeGate(gateConfig.gate)) {
+            gateConfig.gate.gates.splice(idx, 1);
             gateValidity.splice(idx, 1);
-            if (gate.gates.length === 1) {
-                gate = gate.gates[0];
+            if (gateConfig.gate.gates.length === 1) {
+                gateConfig.gate = gateConfig.gate.gates[0];
             }
-            gate = gate;
+            gateConfig = gateConfig;
             gateValidity = gateValidity;
         }
     }
@@ -87,6 +97,14 @@
         const label = gateLabel[gate.kind];
         return label ? i18nKey(label) : i18nKey("access.unknownGate");
     }
+
+    function toggleEvaluationInterval() {
+        if (gateConfig.expiry === undefined) {
+            gateConfig.expiry = BigInt(1000 * 60 * 60 * 24 * 7 * 4 * 3); // default this to three months
+        } else {
+            gateConfig.expiry = undefined;
+        }
+    }
 </script>
 
 <Overlay>
@@ -95,25 +113,28 @@
             <Translatable resourceKey={title} />
         </div>
         <div class="body access-gate-builder" slot="body">
-            {#if isLeafGate(gate)}
+            {#if isLeafGate(gateConfig.gate)}
                 <LeafGateBuilder
                     {gateBindings}
                     {neuronGateBindings}
                     {paymentGateBindings}
                     {balanceGateBindings}
                     allowNone
-                    bind:gate
+                    bind:gate={gateConfig.gate}
                     {editable}
                     {level}
                     bind:valid={gateValidity[0]} />
-            {:else if isCompositeGate(gate)}
-                {#each gate.gates as subgate, i (`${subgate.kind} + ${i}`)}
+            {:else if isCompositeGate(gateConfig.gate)}
+                {#each gateConfig.gate.gates as subgate, i (`${subgate.kind} + ${i}`)}
                     <CollapsibleCard
                         transition={false}
                         open={selectedGateIndex === i}
                         on:opened={() => (selectedGateIndex = i)}>
                         <div class="sub-header" slot="titleSlot" class:invalid={!gateValidity[i]}>
-                            <AccessGateIcon {level} showNoGate gate={subgate} />
+                            <AccessGateIcon
+                                {level}
+                                showNoGate
+                                gateConfig={{ expiry: undefined, gate: subgate }} />
                             <Translatable resourceKey={getGateText(subgate)} />
                             {#if editable}
                                 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -159,13 +180,54 @@
                     </div>
                 </div>
             {/if}
+
+            {#if gateConfig.gate.kind !== "no_gate"}
+                {#if editable}
+                    <div class="section expiry">
+                        <Checkbox
+                            id="evaluation-interval"
+                            on:change={toggleEvaluationInterval}
+                            label={i18nKey("access.evaluationInterval")}
+                            align={"start"}
+                            checked={gateConfig.expiry !== undefined}>
+                            <div class="section-title disappear">
+                                <Translatable resourceKey={i18nKey("access.evaluationInterval")} />
+                            </div>
+                            <div class="info">
+                                <Translatable
+                                    resourceKey={i18nKey(
+                                        "access.evaluationIntervalInfo",
+                                        undefined,
+                                        level,
+                                        true,
+                                    )} />
+                            </div>
+                            <div class="info">
+                                {#if gateConfig.expiry !== undefined}
+                                    <DurationPicker
+                                        bind:valid={evaluationIntervalValid}
+                                        bind:milliseconds={gateConfig.expiry}
+                                        unitFilter={(u) => !["minutes", "hours"].includes(u)} />
+                                {/if}
+                            </div>
+                        </Checkbox>
+                    </div>
+                {:else if gateConfig.expiry !== undefined}
+                    <div class="section expiry">
+                        <AccessGateExpiry expiry={gateConfig.expiry} />
+                    </div>
+                {/if}
+            {/if}
         </div>
 
         <div let:onClose slot="footer">
             <div class="access-gate-builder footer">
-                {#if isCompositeGate(gate)}
+                {#if isCompositeGate(gateConfig.gate)}
                     <div class="operator">
-                        <Select disabled={!editable} margin={false} bind:value={gate.operator}>
+                        <Select
+                            disabled={!editable}
+                            margin={false}
+                            bind:value={gateConfig.gate.operator}>
                             <option value={"and"}
                                 ><Translatable resourceKey={i18nKey("access.and")} /></option>
                             <option value={"or"}
@@ -234,4 +296,14 @@
             top: $sp2;
         }
     }
+
+    .section.expiry {
+        margin-top: $sp4;
+    }
+
+    .info {
+        @include font(book, normal, fs-80, 22);
+        color: var(--txt-light);
+        margin-bottom: $sp3;
+    }
 </style>
diff --git a/frontend/app/src/components/home/access/AccessGateCheckFailed.svelte b/frontend/app/src/components/home/access/AccessGateCheckFailed.svelte
index cdd842c11c..ef4b30c41b 100644
--- a/frontend/app/src/components/home/access/AccessGateCheckFailed.svelte
+++ b/frontend/app/src/components/home/access/AccessGateCheckFailed.svelte
@@ -1,19 +1,22 @@
 <script lang="ts">
     import ModalContent from "../../ModalContent.svelte";
-    import type { AccessGateWithLevel } from "openchat-client";
+    import type { EnhancedAccessGate } from "openchat-client";
     import AccessGateSummary from "./AccessGateSummary.svelte";
     import { mobileWidth } from "../../../stores/screenDimensions";
     import Translatable from "../../Translatable.svelte";
     import { i18nKey } from "../../../i18n/i18n";
 
-    export let gates: AccessGateWithLevel[];
+    export let gates: EnhancedAccessGate[];
 </script>
 
 <ModalContent fixedWidth={$mobileWidth} fitToContent={!$mobileWidth} on:close>
     <div slot="header"><Translatable resourceKey={i18nKey("access.gateCheckFailed")} /></div>
     <div class="body" slot="body">
         {#each gates as gate}
-            <AccessGateSummary editable={false} {gate} level={gate.level} />
+            <AccessGateSummary
+                editable={false}
+                gateConfig={{ expiry: gate.expiry, gate }}
+                level={gate.level} />
         {/each}
     </div>
 </ModalContent>
diff --git a/frontend/app/src/components/home/access/AccessGateControl.svelte b/frontend/app/src/components/home/access/AccessGateControl.svelte
index 7c7e00c24a..670896ff55 100644
--- a/frontend/app/src/components/home/access/AccessGateControl.svelte
+++ b/frontend/app/src/components/home/access/AccessGateControl.svelte
@@ -4,12 +4,12 @@
     import { iconSize } from "../../../stores/iconSize";
     import { fade } from "svelte/transition";
     import AccessGateSummary from "./AccessGateSummary.svelte";
-    import type { AccessGate, Level } from "openchat-client";
+    import type { AccessGateConfig, Level } from "openchat-client";
     import Translatable from "../../Translatable.svelte";
     import { i18nKey } from "../../../i18n/i18n";
     import AlertBox from "../../AlertBox.svelte";
 
-    export let gate: AccessGate;
+    export let gateConfig: AccessGateConfig;
     export let level: Level;
     export let valid: boolean;
 </script>
@@ -21,9 +21,15 @@
     <div class="section">
         <div class="section-title">{$_("access.chooseGate")}</div>
         <div class="choose-gate">
-            <AccessGateSummary on:updated showNoGate={true} bind:valid {level} editable bind:gate />
+            <AccessGateSummary
+                on:updated
+                showNoGate={true}
+                bind:valid
+                {level}
+                editable
+                bind:gateConfig />
         </div>
-        {#if gate.kind !== "no_gate"}
+        {#if gateConfig.gate.kind !== "no_gate"}
             <AlertBox>
                 <Translatable
                     resourceKey={i18nKey("access.bypassWarning", undefined, level, true)} />
@@ -56,7 +62,7 @@
     }
 
     .section {
-        margin-bottom: $sp6;
+        margin-bottom: $sp4;
     }
 
     .choose-gate {
diff --git a/frontend/app/src/components/home/access/AccessGateEvaluator.svelte b/frontend/app/src/components/home/access/AccessGateEvaluator.svelte
index 06aa6dc32c..00e9d5474e 100644
--- a/frontend/app/src/components/home/access/AccessGateEvaluator.svelte
+++ b/frontend/app/src/components/home/access/AccessGateEvaluator.svelte
@@ -10,10 +10,9 @@
         isDiamondGate,
         OpenChat,
         shouldPreprocessGate,
-        type AccessGate,
-        type AccessGateWithLevel,
+        type EnhancedAccessGate,
         type LeafGate,
-        type Level,
+        type PaymentGateApprovals,
     } from "openchat-client";
     import { _ } from "svelte-i18n";
     import { i18nKey } from "../../../i18n/i18n";
@@ -33,13 +32,13 @@
     const dispatch = createEventDispatcher();
     const client = getContext<OpenChat>("client");
 
-    export let gates: AccessGateWithLevel[];
-    export let level: Level;
+    export let gates: EnhancedAccessGate[];
 
-    let result: IteratorResult<AccessGate>;
+    let result: IteratorResult<EnhancedAccessGate>;
     let iterator = preprocessGates(gates, needsPreprocessing);
-    let currentGate: AccessGate | undefined;
+    let currentGate: EnhancedAccessGate | undefined;
     let credentials: string[] = [];
+    let paymentApprovals: PaymentGateApprovals = new Map();
     let optionalGatesByIndex: Map<number, LeafGate> = new Map();
     $: optionalInvalid =
         currentGate?.kind === "composite_gate" &&
@@ -47,7 +46,7 @@
 
     onMount(nextGate);
 
-    function needsPreprocessing(gate: AccessGate): boolean {
+    function needsPreprocessing(gate: EnhancedAccessGate): boolean {
         if (isCompositeGate(gate) && gate.operator === "or") {
             return gate.gates.some((g) => shouldPreprocessGate(g));
         } else {
@@ -55,49 +54,83 @@
         }
     }
 
+    function leafGatesMatch(a: LeafGate, b: LeafGate) {
+        return JSON.stringify(a) === JSON.stringify(b);
+    }
+
     function nextGate() {
         result = iterator.next();
         if (!result.done) {
             currentGate = result.value;
             if (isCompositeGate(currentGate) && currentGate.operator === "or") {
-                optionalGatesByIndex = new Map(currentGate.gates.map((g, i) => [i, g]));
+                optionalGatesByIndex = new Map(
+                    currentGate.gates.map((g, i) => [
+                        i,
+                        { ...g, level: currentGate?.level, expiry: currentGate?.expiry },
+                    ]),
+                );
             }
             if (isLeafGate(currentGate)) {
-                const found = [...optionalGatesByIndex.values()].find((g) => g === currentGate);
+                const found = [...optionalGatesByIndex.values()].find((g) =>
+                    leafGatesMatch(g, currentGate as LeafGate),
+                );
                 if (found || client.doesUserMeetAccessGate(currentGate)) {
                     nextGate();
                 }
             }
         } else {
             currentGate = undefined;
-            dispatch("success", { credentials });
+            dispatch("success", { credentials, paymentApprovals });
         }
     }
 
     function* preprocessGates(
-        gates: AccessGate[],
-        predicate: (gate: AccessGate) => boolean,
-    ): Generator<AccessGate> {
+        gates: EnhancedAccessGate[],
+        predicate: (gate: EnhancedAccessGate) => boolean,
+    ): Generator<EnhancedAccessGate> {
         for (const gate of gates) {
             if (predicate(gate)) {
                 yield gate;
             }
             if (isCompositeGate(gate)) {
-                yield* preprocessGates(gate.gates, predicate);
+                yield* preprocessGates(
+                    gate.gates.map((g) => ({ ...g, level: gate.level, expiry: gate.expiry })),
+                    predicate,
+                );
             }
         }
     }
 
+    function approvePayment({
+        detail: { ledger, amount, approvalFee },
+    }: CustomEvent<{ ledger: string; amount: bigint; approvalFee: bigint }>) {
+        const existing = paymentApprovals.get(ledger);
+        if (existing !== undefined) {
+            // if we already have an approval pending for this ledger we add on the amount
+            // but there will only be one fee
+            existing.amount += amount;
+            paymentApprovals.set(ledger, existing);
+        } else {
+            paymentApprovals.set(ledger, {
+                amount,
+                approvalFee,
+            });
+        }
+        nextGate();
+    }
+
     function credentialReceived(ev: CustomEvent<string>) {
         credentials.push(ev.detail);
         nextGate();
     }
 
-    function toggleIndex(i: number, parent: AccessGate | undefined) {
+    function toggleIndex(i: number, parent: EnhancedAccessGate | undefined) {
         if (parent === undefined || !isCompositeGate(parent)) return;
 
         const found = optionalGatesByIndex.has(i);
-        optionalGatesByIndex = new Map(parent.gates.map((g, i) => [i, g]));
+        optionalGatesByIndex = new Map(
+            parent.gates.map((g, i) => [i, { ...g, level: parent.level, expiry: parent.expiry }]),
+        );
         if (found) {
             optionalGatesByIndex.delete(i);
         }
@@ -135,9 +168,9 @@
                             id={`subgate_${i}`}>
                             <AccessGateSummary
                                 editable={false}
-                                {level}
+                                level={currentGate.level}
                                 showNoGate={false}
-                                gate={subgate} />
+                                gateConfig={{ expiry: undefined, gate: subgate }} />
                         </Radio>
                     </div>
                 {/each}
@@ -146,27 +179,29 @@
                     on:close={onClose}
                     on:credentialReceived={credentialReceived}
                     gate={currentGate}
-                    {level} />
+                    level={currentGate.level} />
             {:else if isUniquePersonGate(currentGate)}
                 <UniqueHumanGateEvaluator
                     on:credentialReceived={credentialReceived}
                     on:close={onClose}
-                    {level} />
+                    expiry={currentGate.expiry}
+                    level={currentGate.level} />
             {:else if isPaymentGate(currentGate)}
                 <PaymentGateEvaluator
+                    {paymentApprovals}
                     gate={currentGate}
-                    {level}
-                    on:next={nextGate}
+                    level={currentGate.level}
+                    on:approvePayment={approvePayment}
                     on:close={onClose} />
             {:else if isLifetimeDiamondGate(currentGate)}
                 <DiamondGateEvaluator
-                    {level}
+                    level={currentGate.level}
                     lifetime
                     on:credentialReceived={credentialReceived}
                     on:cancel={onClose} />
             {:else if isDiamondGate(currentGate)}
                 <DiamondGateEvaluator
-                    {level}
+                    level={currentGate.level}
                     lifetime={false}
                     on:credentialReceived={credentialReceived}
                     on:cancel={onClose} />
diff --git a/frontend/app/src/components/home/access/AccessGateExpiry.svelte b/frontend/app/src/components/home/access/AccessGateExpiry.svelte
new file mode 100644
index 0000000000..22766e826f
--- /dev/null
+++ b/frontend/app/src/components/home/access/AccessGateExpiry.svelte
@@ -0,0 +1,57 @@
+<script lang="ts">
+    import { type OpenChat } from "openchat-client";
+    import { i18nKey } from "../../../i18n/i18n";
+    import Translatable from "../../Translatable.svelte";
+    import { getContext } from "svelte";
+    import { msToDays, msToHours, msToMinutes, msToMonths, msToWeeks } from "../../../utils/time";
+
+    type DurationData = {
+        total: number;
+        days: number;
+        hours: number;
+        minutes: number;
+        seconds: number;
+        weeks: number;
+        months: number;
+    };
+
+    const client = getContext<OpenChat>("client");
+
+    export let expiry: bigint | undefined;
+
+    $: duration = expiry ? client.durationFromMilliseconds(Number(expiry)) : undefined;
+
+    $: durationString = formatDuration(duration);
+
+    function formatDuration(duration: DurationData | undefined): string | undefined {
+        if (duration === undefined) return undefined;
+
+        // TODO - pluralisation & i18n
+        if (duration.minutes > 0) {
+            return `${msToMinutes(duration.total)} minutes`;
+        }
+
+        if (duration.hours > 0) {
+            return `${msToHours(duration.total)} hours`;
+        }
+
+        if (duration.days > 0) {
+            return `${msToDays(duration.total)} days`;
+        }
+
+        if (duration.weeks > 0) {
+            return `${msToWeeks(duration.total)} weeks`;
+        }
+
+        if (duration.months > 0) {
+            return `${msToMonths(duration.total)} months`;
+        }
+    }
+</script>
+
+{#if durationString !== undefined}
+    <Translatable
+        resourceKey={i18nKey("access.evaluationIntervalSummary", {
+            interval: durationString,
+        })} />
+{/if}
diff --git a/frontend/app/src/components/home/access/AccessGateIcon.svelte b/frontend/app/src/components/home/access/AccessGateIcon.svelte
index 9cb2026ac9..cda9b263cc 100644
--- a/frontend/app/src/components/home/access/AccessGateIcon.svelte
+++ b/frontend/app/src/components/home/access/AccessGateIcon.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import Alarm from "svelte-material-icons/Alarm.svelte";
     import AccountCheck from "svelte-material-icons/AccountCheck.svelte";
     import AccountPlusOutline from "svelte-material-icons/AccountPlusOutline.svelte";
     import VectorCombine from "svelte-material-icons/VectorCombine.svelte";
@@ -14,6 +15,7 @@
         type CryptocurrencyDetails,
         isBalanceGate,
         type Level,
+        type AccessGateConfig,
     } from "openchat-client";
     import { getContext } from "svelte";
     import type { Alignment, Position } from "../../../utils/alignment";
@@ -24,8 +26,9 @@
     import BlueDiamond from "../../icons/BlueDiamond.svelte";
     import { iconSize } from "../../../stores/iconSize";
     import AccessGateBuilder from "./AccessGateBuilder.svelte";
+    import AccessGateExpiry from "./AccessGateExpiry.svelte";
 
-    export let gate: AccessGate;
+    export let gateConfig: AccessGateConfig;
     export let position: Position = "top";
     export let align: Alignment = "start";
     export let small = false;
@@ -38,8 +41,8 @@
 
     let showDetail = false;
 
-    $: tokenDetails = client.getTokenDetailsForAccessGate(gate);
-    $: params = formatParams(gate, tokenDetails);
+    $: tokenDetails = client.getTokenDetailsForAccessGate(gateConfig.gate);
+    $: params = formatParams(gateConfig.gate, tokenDetails);
     $: defaultColor = button ? "var(--button-txt)" : "var(--icon-txt)";
 
     function formatParams(
@@ -91,14 +94,14 @@
         valid={true}
         {level}
         on:close={() => (showDetail = false)}
-        {gate}
+        {gateConfig}
         editable={false} />
 {/if}
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={onClick} class="wrapper">
-    {#if gate.kind === "no_gate" && showNoGate}
+    {#if gateConfig.gate.kind === "no_gate" && showNoGate}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="open">
                 <ShieldLockOpenOutline size={$iconSize} color={defaultColor} />
@@ -109,7 +112,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "locked_gate"}
+    {:else if gateConfig.gate.kind === "locked_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="locked"></div>
             <div let:position let:align slot="tooltip">
@@ -119,7 +122,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "composite_gate"}
+    {:else if gateConfig.gate.kind === "composite_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="composite">
                 <VectorCombine size={$iconSize} color={defaultColor} />
@@ -130,7 +133,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "diamond_gate"}
+    {:else if gateConfig.gate.kind === "diamond_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="diamond">
                 <BlueDiamond />
@@ -141,7 +144,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "lifetime_diamond_gate"}
+    {:else if gateConfig.gate.kind === "lifetime_diamond_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="diamond">
                 <GoldDiamond />
@@ -152,7 +155,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "unique_person_gate"}
+    {:else if gateConfig.gate.kind === "unique_person_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="unique">
                 <AccountCheck size={$iconSize} color={defaultColor} />
@@ -163,16 +166,16 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "credential_gate"}
+    {:else if gateConfig.gate.kind === "credential_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="credential">🔒️</div>
             <div let:position let:align slot="tooltip">
                 <TooltipPopup {position} {align}>
-                    <CredentialGatePopup {gate} />
+                    <CredentialGatePopup gate={gateConfig.gate} />
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if gate.kind === "referred_by_member_gate"}
+    {:else if gateConfig.gate.kind === "referred_by_member_gate"}
         <TooltipWrapper {position} {align}>
             <div slot="target" class="referred_by_member">
                 <AccountPlusOutline size={$iconSize} color={defaultColor} />
@@ -183,7 +186,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if isNeuronGate(gate)}
+    {:else if isNeuronGate(gateConfig.gate)}
         <TooltipWrapper {position} {align}>
             <img slot="target" class="icon" class:small src={tokenDetails?.logo} />
             <div let:position let:align slot="tooltip">
@@ -199,7 +202,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if isPaymentGate(gate)}
+    {:else if isPaymentGate(gateConfig.gate)}
         <TooltipWrapper {position} {align}>
             <img slot="target" class="icon" class:small src={tokenDetails?.logo} />
             <div let:position let:align slot="tooltip">
@@ -215,7 +218,7 @@
                 </TooltipPopup>
             </div>
         </TooltipWrapper>
-    {:else if isBalanceGate(gate)}
+    {:else if isBalanceGate(gateConfig.gate)}
         <TooltipWrapper {position} {align}>
             <img slot="target" class="icon" class:small src={tokenDetails?.logo} />
             <div let:position let:align slot="tooltip">
@@ -228,7 +231,7 @@
                                     ? {
                                           token: tokenDetails.symbol,
                                           n: client.formatTokens(
-                                              gate.minBalance,
+                                              gateConfig.gate.minBalance,
                                               tokenDetails?.decimals ?? 8,
                                           ),
                                       }
@@ -240,6 +243,19 @@
             </div>
         </TooltipWrapper>
     {/if}
+
+    {#if gateConfig.expiry !== undefined}
+        <TooltipWrapper {position} {align}>
+            <div slot="target" class="expiry">
+                <Alarm size={"0.9em"} color={defaultColor} />
+            </div>
+            <div let:position let:align slot="tooltip">
+                <TooltipPopup {position} {align}>
+                    <AccessGateExpiry expiry={gateConfig.expiry} />
+                </TooltipPopup>
+            </div>
+        </TooltipWrapper>
+    {/if}
 </div>
 
 <style lang="scss">
@@ -275,4 +291,20 @@
         height: $size;
         background-image: url("/assets/locked.svg");
     }
+
+    .wrapper {
+        display: flex;
+        gap: $sp2;
+        align-items: center;
+    }
+
+    .expiry {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 22px;
+        height: 22px;
+        background-color: var(--icon-hv);
+        border-radius: 50%;
+    }
 </style>
diff --git a/frontend/app/src/components/home/access/AccessGateIconsForChat.svelte b/frontend/app/src/components/home/access/AccessGateIconsForChat.svelte
index 8e12f9e9d1..0345063d21 100644
--- a/frontend/app/src/components/home/access/AccessGateIconsForChat.svelte
+++ b/frontend/app/src/components/home/access/AccessGateIconsForChat.svelte
@@ -1,14 +1,17 @@
 <script lang="ts">
-    import type { AccessGateWithLevel } from "openchat-client";
+    import type { EnhancedAccessGate } from "openchat-client";
     import AccessGateIcon from "./AccessGateIcon.svelte";
 
-    export let gates: AccessGateWithLevel[];
+    export let gates: EnhancedAccessGate[];
 </script>
 
 {#if gates.length > 0}
     <div class="icons">
         {#each gates as gate, i}
-            <AccessGateIcon clickable level={gate.level} {gate} />
+            <AccessGateIcon
+                clickable
+                level={gate.level}
+                gateConfig={{ expiry: gate.expiry, gate }} />
             {#if gates.length > 1 && i < gates.length - 1}
                 <span>&</span>
             {/if}
diff --git a/frontend/app/src/components/home/access/AccessGateSummary.svelte b/frontend/app/src/components/home/access/AccessGateSummary.svelte
index f5c6a60585..5402d758e6 100644
--- a/frontend/app/src/components/home/access/AccessGateSummary.svelte
+++ b/frontend/app/src/components/home/access/AccessGateSummary.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { type AccessGate, type Level } from "openchat-client";
+    import { type AccessGate, type AccessGateConfig, type Level } from "openchat-client";
     import AccessGateIcon from "./AccessGateIcon.svelte";
     import { gateLabel } from "../../../utils/access";
     import { i18nKey } from "../../../i18n/i18n";
@@ -10,7 +10,7 @@
 
     const dispatch = createEventDispatcher();
 
-    export let gate: AccessGate;
+    export let gateConfig: AccessGateConfig;
     export let editable: boolean;
     export let level: Level;
     export let valid: boolean = true;
@@ -18,7 +18,7 @@
 
     let showDetail = false;
 
-    $: gateText = getGateText(gate);
+    $: gateText = getGateText(gateConfig.gate);
 
     function open(e: Event) {
         e.preventDefault();
@@ -46,15 +46,15 @@
 </script>
 
 {#if showDetail}
-    <AccessGateBuilder bind:valid {level} on:close={close} bind:gate {editable} />
+    <AccessGateBuilder bind:valid {level} on:close={close} bind:gateConfig {editable} />
 {/if}
 
-{#if gate.kind !== "no_gate" || showNoGate}
+{#if gateConfig.gate.kind !== "no_gate" || showNoGate}
     <!-- svelte-ignore a11y-click-events-have-key-events -->
     <!-- svelte-ignore a11y-no-static-element-interactions -->
     <div class:invalid={!valid} on:click={open} class:editable class="summary">
         <div class="icon">
-            <AccessGateIcon button {level} showNoGate {gate} />
+            <AccessGateIcon button {level} showNoGate {gateConfig} />
         </div>
         <div class="name">
             {#if gateText !== undefined}
diff --git a/frontend/app/src/components/home/access/CredentialGateEvaluator.svelte b/frontend/app/src/components/home/access/CredentialGateEvaluator.svelte
index 6d4493e14a..785e169c70 100644
--- a/frontend/app/src/components/home/access/CredentialGateEvaluator.svelte
+++ b/frontend/app/src/components/home/access/CredentialGateEvaluator.svelte
@@ -8,11 +8,13 @@
     import Translatable from "../../Translatable.svelte";
     import FancyLoader from "../../icons/FancyLoader.svelte";
     import LinkAccounts from "../profile/LinkAccounts.svelte";
+    import AlertBox from "../../AlertBox.svelte";
+    import AccessGateExpiry from "./AccessGateExpiry.svelte";
 
     const client = getContext<OpenChat>("client");
     const dispatch = createEventDispatcher();
 
-    export let gate: CredentialGate;
+    export let gate: CredentialGate & { expiry: bigint | undefined };
     export let level: Level;
 
     let failed = false;
@@ -94,6 +96,11 @@
                     level,
                     true,
                 )} />
+            {#if gate.expiry !== undefined}
+                <AlertBox>
+                    <AccessGateExpiry expiry={gate.expiry} />
+                </AlertBox>
+            {/if}
         {/if}
     </div>
     <div>
diff --git a/frontend/app/src/components/home/access/PaymentGateEvaluator.svelte b/frontend/app/src/components/home/access/PaymentGateEvaluator.svelte
index e68631660c..f297a1d56e 100644
--- a/frontend/app/src/components/home/access/PaymentGateEvaluator.svelte
+++ b/frontend/app/src/components/home/access/PaymentGateEvaluator.svelte
@@ -1,6 +1,12 @@
 <script lang="ts">
     import { _ } from "svelte-i18n";
-    import type { PaymentGate, OpenChat, ResourceKey, Level } from "openchat-client";
+    import {
+        type PaymentGate,
+        type OpenChat,
+        type ResourceKey,
+        type Level,
+        type PaymentGateApprovals,
+    } from "openchat-client";
     import { createEventDispatcher, getContext } from "svelte";
     import BalanceWithRefresh from "../BalanceWithRefresh.svelte";
     import { i18nKey, interpolate } from "../../../i18n/i18n";
@@ -11,12 +17,15 @@
     import AccountInfo from "../AccountInfo.svelte";
     import ErrorMessage from "../../ErrorMessage.svelte";
     import Markdown from "../Markdown.svelte";
+    import AlertBox from "../../AlertBox.svelte";
+    import AccessGateExpiry from "./AccessGateExpiry.svelte";
 
     const client = getContext<OpenChat>("client");
     const dispatch = createEventDispatcher();
 
-    export let gate: PaymentGate;
+    export let gate: PaymentGate & { expiry: bigint | undefined };
     export let level: Level;
+    export let paymentApprovals: PaymentGateApprovals;
 
     let error: ResourceKey | undefined = undefined;
     let balanceWithRefresh: BalanceWithRefresh;
@@ -25,7 +34,12 @@
     $: user = client.user;
     $: token = client.getTokenDetailsForAccessGate(gate)!;
     $: cryptoBalanceStore = client.cryptoBalance;
-    $: cryptoBalance = $cryptoBalanceStore[token.ledger] ?? BigInt(0);
+    $: originalBalance = $cryptoBalanceStore[token.ledger] ?? BigInt(0);
+    $: cryptoBalance = balanceAfterCurrentCommitments(
+        token.ledger,
+        paymentApprovals,
+        originalBalance,
+    );
     $: insufficientFunds = cryptoBalance < gate.amount;
     $: approvalMessage = interpolate(
         $_,
@@ -45,6 +59,14 @@
     );
     $: errorMessage = error !== undefined ? error : $pinNumberErrorMessageStore;
 
+    function balanceAfterCurrentCommitments(
+        ledger: string,
+        approvals: PaymentGateApprovals,
+        balance: bigint,
+    ) {
+        return balance - (approvals.get(ledger)?.amount ?? 0n);
+    }
+
     function onStartRefreshingBalance() {
         refreshingBalance = true;
     }
@@ -63,7 +85,11 @@
         if (insufficientFunds) {
             balanceWithRefresh.refresh();
         } else {
-            dispatch("next");
+            dispatch("approvePayment", {
+                ledger: token.ledger,
+                amount: gate.amount,
+                approvalFee: token.transferFee,
+            });
         }
     }
 </script>
@@ -89,6 +115,11 @@
     <p>
         <Markdown text={approvalMessage + " " + distributionMessage} />
     </p>
+    {#if gate.expiry !== undefined}
+        <AlertBox>
+            <AccessGateExpiry expiry={gate.expiry} />
+        </AlertBox>
+    {/if}
     {#if errorMessage !== undefined}
         <div class="error">
             <ErrorMessage><Translatable resourceKey={errorMessage} /></ErrorMessage>
diff --git a/frontend/app/src/components/home/access/UniqueHumanGateEvaluator.svelte b/frontend/app/src/components/home/access/UniqueHumanGateEvaluator.svelte
index 0b7a543c24..b2a5cac849 100644
--- a/frontend/app/src/components/home/access/UniqueHumanGateEvaluator.svelte
+++ b/frontend/app/src/components/home/access/UniqueHumanGateEvaluator.svelte
@@ -14,11 +14,14 @@
     import HumanityConfirmation from "../HumanityConfirmation.svelte";
     import FancyLoader from "../../icons/FancyLoader.svelte";
     import LinkAccounts from "../profile/LinkAccounts.svelte";
+    import AlertBox from "../../AlertBox.svelte";
+    import AccessGateExpiry from "./AccessGateExpiry.svelte";
 
     const client = getContext<OpenChat>("client");
     const dispatch = createEventDispatcher();
 
     export let level: Level;
+    export let expiry: bigint | undefined;
 
     let failed = false;
     let verifying = false;
@@ -114,6 +117,12 @@
             </p>
 
             <HumanityConfirmation bind:confirmed />
+
+            {#if expiry !== undefined}
+                <AlertBox>
+                    <AccessGateExpiry {expiry} />
+                </AlertBox>
+            {/if}
         {/if}
     </div>
     <div>
diff --git a/frontend/app/src/components/home/addgroup/NewGroup.svelte b/frontend/app/src/components/home/addgroup/NewGroup.svelte
index 4c72164f4d..3958d92852 100644
--- a/frontend/app/src/components/home/addgroup/NewGroup.svelte
+++ b/frontend/app/src/components/home/addgroup/NewGroup.svelte
@@ -75,7 +75,8 @@
     $: avatarDirty = editing && candidateGroup.avatar?.blobUrl !== originalGroup.avatar?.blobUrl;
     $: visDirty = editing && candidateGroup.public !== originalGroup.public;
     $: infoDirty = nameDirty || descDirty || avatarDirty || externalUrlDirty;
-    $: gateDirty = editing && client.hasAccessGateChanged(candidateGroup.gate, originalGroup.gate);
+    $: gateDirty =
+        editing && client.hasAccessGateChanged(candidateGroup.gateConfig, originalGroup.gateConfig);
     $: ttlDirty = editing && candidateGroup.eventsTTL !== originalGroup.eventsTTL;
     $: messagesVisibleToNonMembersDirty =
         editing &&
@@ -236,7 +237,7 @@
                         ? "set_to_none"
                         : { value: updatedGroup.eventsTTL }
                     : undefined,
-                gateDirty ? updatedGroup.gate : undefined,
+                gateDirty ? updatedGroup.gateConfig : undefined,
                 visDirty ? updatedGroup.public : undefined,
                 messagesVisibleToNonMembersDirty
                     ? updatedGroup.messagesVisibleToNonMembers
@@ -499,6 +500,8 @@
         height: 550px;
         display: flex;
         @include nice-scrollbar();
+        overflow-y: scroll;
+        scrollbar-gutter: stable;
 
         @include mobile() {
             height: 400px;
diff --git a/frontend/app/src/components/home/communities/PreviewWrapper.svelte b/frontend/app/src/components/home/communities/PreviewWrapper.svelte
index 741be8ef41..7213c63abf 100644
--- a/frontend/app/src/components/home/communities/PreviewWrapper.svelte
+++ b/frontend/app/src/components/home/communities/PreviewWrapper.svelte
@@ -3,7 +3,7 @@
     import Overlay from "../../Overlay.svelte";
     import { getContext, tick } from "svelte";
     import { toastStore } from "../../../stores/toast";
-    import type { AccessGateWithLevel, GateCheckSucceeded, OpenChat } from "openchat-client";
+    import type { EnhancedAccessGate, GateCheckSucceeded, OpenChat } from "openchat-client";
     import { i18nKey } from "../../../i18n/i18n";
     import AccessGateEvaluator from "../access/AccessGateEvaluator.svelte";
 
@@ -12,7 +12,8 @@
     $: anonUser = client.anonUser;
     $: identityState = client.identityState;
     $: selectedCommunity = client.selectedCommunity;
-    $: previewingCommunity = $selectedCommunity?.membership.role === "none";
+    $: previewingCommunity =
+        $selectedCommunity?.membership.role === "none" || $selectedCommunity?.membership.lapsed;
 
     $: {
         if (
@@ -25,8 +26,8 @@
     }
 
     let joiningCommunity = false;
-    let gateCheckFailed: AccessGateWithLevel | undefined = undefined;
-    let checkingAccessGate: AccessGateWithLevel | undefined = undefined;
+    let gateCheckFailed: EnhancedAccessGate | undefined = undefined;
+    let checkingAccessGate: EnhancedAccessGate | undefined = undefined;
 
     function joinCommunity() {
         if ($anonUser) {
@@ -46,14 +47,20 @@
     function doJoinCommunity(gateCheck: GateCheckSucceeded | undefined): Promise<void> {
         if (previewingCommunity && $selectedCommunity) {
             const credentials = gateCheck?.credentials ?? [];
-            const gateWithLevel: AccessGateWithLevel = {
-                ...$selectedCommunity.gate,
+            const paymentApprovals = gateCheck?.paymentApprovals ?? new Map();
+            const gateConfigWithLevel: EnhancedAccessGate = {
+                ...$selectedCommunity.gateConfig.gate,
                 level: "community",
+                expiry: $selectedCommunity.gateConfig.expiry,
             };
 
             if (gateCheck === undefined) {
-                if ($selectedCommunity.gate.kind !== "no_gate" && !$selectedCommunity.isInvited) {
-                    const gates = [$selectedCommunity.gate];
+                if (
+                    $selectedCommunity.gateConfig.gate.kind !== "no_gate" &&
+                    !$selectedCommunity.isInvited
+                ) {
+                    const gateConfigs = [$selectedCommunity.gateConfig];
+                    const gates = gateConfigs.map((gc) => gc.gate);
                     const passed = client.doesUserMeetAccessGates(gates);
                     if (!passed) {
                         /**
@@ -61,7 +68,7 @@
                          * pre-processing.
                          */
                         if (client.gatePreprocessingRequired(gates)) {
-                            checkingAccessGate = gateWithLevel;
+                            checkingAccessGate = gateConfigWithLevel;
                             return Promise.resolve();
                         }
                     }
@@ -72,10 +79,10 @@
             joiningCommunity = true;
 
             return client
-                .joinCommunity($selectedCommunity, credentials)
+                .joinCommunity($selectedCommunity, credentials, paymentApprovals)
                 .then((resp) => {
                     if (resp.kind === "gate_check_failed") {
-                        gateCheckFailed = gateWithLevel;
+                        gateCheckFailed = gateConfigWithLevel;
                     } else if (resp.kind !== "success") {
                         toastStore.showFailureToast(i18nKey("communities.errors.joinFailed"));
                     }
@@ -94,7 +101,6 @@
 {#if checkingAccessGate}
     <Overlay dismissible on:close={closeModal}>
         <AccessGateEvaluator
-            level={checkingAccessGate.level}
             gates={[checkingAccessGate]}
             on:close={closeModal}
             on:success={accessGatesEvaluated} />
diff --git a/frontend/app/src/components/home/communities/details/ChannelCard.svelte b/frontend/app/src/components/home/communities/details/ChannelCard.svelte
index d8dde9b551..f6d637794f 100644
--- a/frontend/app/src/components/home/communities/details/ChannelCard.svelte
+++ b/frontend/app/src/components/home/communities/details/ChannelCard.svelte
@@ -57,7 +57,7 @@
                         small
                         position={"bottom"}
                         align={"middle"}
-                        gate={channel.gate} />
+                        gateConfig={channel.gateConfig} />
                 </div>
             </div>
         </div>
diff --git a/frontend/app/src/components/home/communities/details/CommunityDetails.svelte b/frontend/app/src/components/home/communities/details/CommunityDetails.svelte
index d542a2d8f6..9489597c00 100644
--- a/frontend/app/src/components/home/communities/details/CommunityDetails.svelte
+++ b/frontend/app/src/components/home/communities/details/CommunityDetails.svelte
@@ -18,6 +18,7 @@
     import { i18nKey } from "../../../../i18n/i18n";
     import Translatable from "../../../Translatable.svelte";
     import ReferredUsersList from "../../profile/ReferredUsersList.svelte";
+    import AccessGateExpiry from "../../access/AccessGateExpiry.svelte";
 
     export let community: CommunitySummary;
     export let rules: Rules | undefined;
@@ -73,7 +74,15 @@
                 {/if}
             {/if}
         </div>
-        <AccessGateSummary editable={false} level={community.level} gate={community.gate} />
+        <AccessGateSummary
+            editable={false}
+            level={community.level}
+            gateConfig={community.gateConfig} />
+        {#if community.gateConfig.expiry !== undefined}
+            <div class="expiry">
+                <AccessGateExpiry expiry={community.gateConfig.expiry} />
+            </div>
+        {/if}
     </CollapsibleCard>
     {#if rules !== undefined && rules.enabled}
         <CollapsibleCard
@@ -125,4 +134,10 @@
             margin: 0 $sp3;
         }
     }
+
+    .expiry {
+        color: var(--txt-light);
+        @include font(book, normal, fs-90);
+        margin-top: $sp3;
+    }
 </style>
diff --git a/frontend/app/src/components/home/communities/details/CommunitySummary.svelte b/frontend/app/src/components/home/communities/details/CommunitySummary.svelte
index 92f6f0e03a..5bbc4df797 100644
--- a/frontend/app/src/components/home/communities/details/CommunitySummary.svelte
+++ b/frontend/app/src/components/home/communities/details/CommunitySummary.svelte
@@ -32,7 +32,7 @@
             banner={$selectedCommunity.banner}
             avatar={$selectedCommunity.avatar}
             memberCount={$selectedCommunity.memberCount}
-            gate={$selectedCommunity.gate}
+            gateConfig={$selectedCommunity.gateConfig}
             language={$selectedCommunity.primaryLanguage}
             flags={0}
             channelCount={0}
diff --git a/frontend/app/src/components/home/communities/edit/Edit.svelte b/frontend/app/src/components/home/communities/edit/Edit.svelte
index 3f18f9a484..129f051d48 100644
--- a/frontend/app/src/components/home/communities/edit/Edit.svelte
+++ b/frontend/app/src/components/home/communities/edit/Edit.svelte
@@ -64,7 +64,7 @@
     $: bannerDirty = editing && candidate.banner.blobUrl !== original.banner.blobUrl;
     $: visDirty = editing && candidate.public !== original.public;
     $: infoDirty = nameDirty || descDirty || avatarDirty || bannerDirty || languageDirty;
-    $: gateDirty = client.hasAccessGateChanged(candidate.gate, original.gate);
+    $: gateDirty = client.hasAccessGateChanged(candidate.gateConfig, original.gateConfig);
     $: dirty = infoDirty || rulesDirty || permissionsDirty || visDirty || gateDirty;
     $: stepIndex = steps.findIndex((s) => s.key === step) ?? 0;
     $: valid = detailsValid && channelsValid && rulesValid && visibilityValid;
@@ -94,7 +94,10 @@
         candidate = {
             ...original,
             permissions: { ...original.permissions },
-            gate: { ...original.gate },
+            gateConfig: {
+                gate: { ...original.gateConfig.gate },
+                expiry: original.gateConfig.expiry,
+            },
         };
         candidateRules = { ...originalRules, newVersion: false };
     });
@@ -153,7 +156,7 @@
                     permissionsDirty ? candidate.permissions : undefined,
                     avatarDirty ? candidate.avatar.blobData : undefined,
                     bannerDirty ? candidate.banner.blobData : undefined,
-                    gateDirty ? candidate.gate : undefined,
+                    gateDirty ? candidate.gateConfig : undefined,
                     candidate.public !== original.public ? candidate.public : undefined,
                     languageDirty ? candidate.primaryLanguage : undefined,
                 )
diff --git a/frontend/app/src/components/home/communities/explore/CommunityCard.svelte b/frontend/app/src/components/home/communities/explore/CommunityCard.svelte
index 14c5b618ad..ca6a8919b4 100644
--- a/frontend/app/src/components/home/communities/explore/CommunityCard.svelte
+++ b/frontend/app/src/components/home/communities/explore/CommunityCard.svelte
@@ -3,7 +3,7 @@
 <script lang="ts">
     import AccountMultiple from "svelte-material-icons/AccountMultiple.svelte";
     import Pound from "svelte-material-icons/Pound.svelte";
-    import type { AccessGate, DataContent, OpenChat } from "openchat-client";
+    import type { AccessGateConfig, DataContent, OpenChat } from "openchat-client";
     import Avatar from "../../../Avatar.svelte";
     import IntersectionObserver from "../../IntersectionObserver.svelte";
     import { _ } from "svelte-i18n";
@@ -25,7 +25,7 @@
     export let memberCount: number;
     export let channelCount: number;
     export let header = false;
-    export let gate: AccessGate;
+    export let gateConfig: AccessGateConfig;
     export let language: string;
     export let flags: number;
 
@@ -56,7 +56,7 @@
                     level={"community"}
                     position={"bottom"}
                     align={"end"}
-                    {gate} />
+                    {gateConfig} />
             </div>
             <div class="avatar">
                 <Avatar
diff --git a/frontend/app/src/components/home/communities/explore/Explore.svelte b/frontend/app/src/components/home/communities/explore/Explore.svelte
index c1cc88a573..4b0c3a3dde 100644
--- a/frontend/app/src/components/home/communities/explore/Explore.svelte
+++ b/frontend/app/src/components/home/communities/explore/Explore.svelte
@@ -244,7 +244,7 @@
                             banner={community.banner}
                             memberCount={community.memberCount}
                             channelCount={community.channelCount}
-                            gate={community.gate}
+                            gateConfig={community.gateConfig}
                             language={community.primaryLanguage}
                             flags={community.flags} />
                     </CommunityCardLink>
diff --git a/frontend/app/src/components/home/groupdetails/BlockedUser.svelte b/frontend/app/src/components/home/groupdetails/BlockedUser.svelte
index 935badb593..848bdd0498 100644
--- a/frontend/app/src/components/home/groupdetails/BlockedUser.svelte
+++ b/frontend/app/src/components/home/groupdetails/BlockedUser.svelte
@@ -19,13 +19,14 @@
     export let user: UserSummary;
     export let canUnblockUser: boolean = false;
     export let searchTerm: string = "";
+    export let me = false;
 
     function unblockUser() {
         dispatch("unblockUser", user);
     }
 </script>
 
-<User {user} {searchTerm}>
+<User {me} {user} {searchTerm}>
     {#if canUnblockUser}
         <span class="menu">
             <MenuIcon position={"bottom"} align={"end"}>
diff --git a/frontend/app/src/components/home/groupdetails/GroupDetailsBody.svelte b/frontend/app/src/components/home/groupdetails/GroupDetailsBody.svelte
index 00eac781ce..27a34bd063 100644
--- a/frontend/app/src/components/home/groupdetails/GroupDetailsBody.svelte
+++ b/frontend/app/src/components/home/groupdetails/GroupDetailsBody.svelte
@@ -23,6 +23,7 @@
     import DisappearingMessagesSummary from "../DisappearingMessagesSummary.svelte";
     import { i18nKey } from "../../../i18n/i18n";
     import Translatable from "../../Translatable.svelte";
+    import AccessGateExpiry from "../access/AccessGateExpiry.svelte";
 
     const client = getContext<OpenChat>("client");
 
@@ -46,7 +47,7 @@
     function description(chat: MultiUserChat): string {
         let description = chat.description;
 
-        if (chat.subtype?.kind === "governance_proposals" ?? false) {
+        if (chat.subtype?.kind === "governance_proposals") {
             description = description.replace("{userId}", $currentUser.userId);
         }
 
@@ -136,7 +137,12 @@
             {#if !externalContent}
                 <DisappearingMessagesSummary ttl={chat.eventsTTL} />
             {/if}
-            <AccessGateSummary level={chat.level} editable={false} gate={chat.gate} />
+            <AccessGateSummary level={chat.level} editable={false} gateConfig={chat.gateConfig} />
+            {#if chat.gateConfig.expiry !== undefined}
+                <div class="expiry">
+                    <AccessGateExpiry expiry={chat.gateConfig.expiry} />
+                </div>
+            {/if}
         </CollapsibleCard>
         {#if combinedRulesText.length > 0}
             <CollapsibleCard
@@ -208,7 +214,7 @@
         display: flex;
         flex-direction: column;
         gap: $sp3;
-        padding: $sp3 $sp5 0 $sp5;
+        padding: $sp3 $sp4 0 $sp4;
 
         @include mobile() {
             padding: $sp3 $sp4 0 $sp4;
@@ -249,4 +255,10 @@
             }
         }
     }
+
+    .expiry {
+        color: var(--txt-light);
+        @include font(book, normal, fs-90);
+        margin-top: $sp3;
+    }
 </style>
diff --git a/frontend/app/src/components/home/groupdetails/InvitedUser.svelte b/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
index 5ab20fbb16..4e4a9624b7 100644
--- a/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
+++ b/frontend/app/src/components/home/groupdetails/InvitedUser.svelte
@@ -19,13 +19,14 @@
     export let user: UserSummary;
     export let canUninviteUser: boolean = false;
     export let searchTerm: string = "";
+    export let me = false;
 
     function cancelInvite() {
         dispatch("cancelInvite", user.userId);
     }
 </script>
 
-<User {user} {searchTerm}>
+<User {me} {user} {searchTerm}>
     {#if canUninviteUser}
         <span class="menu">
             <MenuIcon position={"bottom"} align={"end"}>
diff --git a/frontend/app/src/components/home/groupdetails/Member.svelte b/frontend/app/src/components/home/groupdetails/Member.svelte
index 9709a4dcd1..8c425b797c 100644
--- a/frontend/app/src/components/home/groupdetails/Member.svelte
+++ b/frontend/app/src/components/home/groupdetails/Member.svelte
@@ -71,6 +71,7 @@
     user={member}
     {me}
     {searchTerm}
+    lapsed={member.lapsed}
     role={member.role === "moderator" || member.role === "admin" || member.role === "owner"
         ? member.role
         : undefined}>
diff --git a/frontend/app/src/components/home/groupdetails/Members.svelte b/frontend/app/src/components/home/groupdetails/Members.svelte
index 5b9e571b5b..f6a00fc0c2 100644
--- a/frontend/app/src/components/home/groupdetails/Members.svelte
+++ b/frontend/app/src/components/home/groupdetails/Members.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+    import Alarm from "svelte-material-icons/Alarm.svelte";
+    import AccountMultiple from "svelte-material-icons/AccountMultiple.svelte";
+    import AccountPlusOutline from "svelte-material-icons/AccountPlusOutline.svelte";
+    import Cancel from "svelte-material-icons/Cancel.svelte";
     import { _ } from "svelte-i18n";
     import Search from "../../Search.svelte";
     import Member from "./Member.svelte";
@@ -19,14 +23,13 @@
         LARGE_GROUP_THRESHOLD,
     } from "openchat-client";
     import { createEventDispatcher, getContext } from "svelte";
-    import SelectionButton from "../SelectionButton.svelte";
     import InvitedUser from "./InvitedUser.svelte";
     import { menuCloser } from "../../../actions/closeMenu";
     import UserGroups from "../communities/details/UserGroups.svelte";
     import Translatable from "../../Translatable.svelte";
     import { i18nKey } from "../../../i18n/i18n";
     import { trimLeadingAtSymbol } from "../../../utils/user";
-    import ButtonGroup from "../../ButtonGroup.svelte";
+    import User from "./User.svelte";
 
     const MAX_SEARCH_RESULTS = 255; // irritatingly this is a nat8 in the candid
     const client = getContext<OpenChat>("client");
@@ -36,6 +39,7 @@
     export let invited: Set<string>;
     export let members: MemberType[];
     export let blocked: Set<string>;
+    export let lapsed: Set<string>;
     export let initialUsergroup: number | undefined = undefined;
     export let showHeader = true;
 
@@ -50,19 +54,24 @@
     $: fullMembers = knownUsers
         .filter((u) => matchesSearch(searchTermLower, u) && u.userId !== userId)
         .sort(compareMembers);
-    $: blockedUsers = matchingUsers(searchTermLower, $userStore, blocked);
-    $: invitedUsers = matchingUsers(searchTermLower, $userStore, invited);
+    $: blockedUsers = matchingUsers(searchTermLower, $userStore, blocked, true);
+    $: lapsedMembers = matchingUsers(searchTermLower, $userStore, lapsed, true);
+    $: invitedUsers = matchingUsers(searchTermLower, $userStore, invited, true);
     $: showBlocked = blockedUsers.length > 0;
     $: showInvited = invitedUsers.length > 0;
+    $: showLapsed = lapsedMembers.length > 0;
     $: canInvite = client.canInviteUsers(collection.id);
-    //$: platformModerator = client.platformModerator;
-    //$: canPromoteMyselfToOwner = me !== undefined && me.role !== "owner" && $platformModerator;
     $: canPromoteMyselfToOwner = false;
 
-    function matchingUsers(term: string, users: UserLookup, ids: Set<string>): UserSummary[] {
+    function matchingUsers(
+        term: string,
+        users: UserLookup,
+        ids: Set<string>,
+        includeMe = false,
+    ): UserSummary[] {
         return Array.from(ids).reduce((matching, id) => {
             const user = users.get(id);
-            if (user && matchesSearch(term, user) && user.userId !== userId) {
+            if (user && matchesSearch(term, user) && (user.userId !== userId || includeMe)) {
                 matching.push(user);
             }
             return matching;
@@ -72,7 +81,7 @@
     let searchTermEntered = "";
     let id = collection.id;
     let membersList: VirtualList;
-    let memberView: "members" | "blocked" | "invited" = "members";
+    let memberView: "members" | "blocked" | "invited" | "lapsed" = "members";
     let selectedTab: "users" | "groups" = "users";
 
     $: searchTerm = trimLeadingAtSymbol(searchTermEntered);
@@ -155,7 +164,7 @@
         return 0;
     }
 
-    function setView(v: "members" | "blocked" | "invited"): void {
+    function setView(v: "members" | "blocked" | "invited" | "lapsed"): void {
         memberView = v;
     }
 
@@ -214,26 +223,68 @@
             placeholder={i18nKey("search")} />
     </div>
 
-    {#if showBlocked || showInvited}
-        <div class="member-section-selector">
-            <ButtonGroup align="fill">
-                <SelectionButton
-                    title={$_("members")}
-                    on:click={() => setView("members")}
-                    selected={memberView === "members"} />
-                {#if showInvited}
-                    <SelectionButton
-                        title={$_("invited")}
-                        on:click={() => setView("invited")}
-                        selected={memberView === "invited"} />
-                {/if}
-                {#if showBlocked}
-                    <SelectionButton
-                        title={$_("blocked")}
-                        on:click={() => setView("blocked")}
-                        selected={memberView === "blocked"} />
-                {/if}
-            </ButtonGroup>
+    {#if showBlocked || showInvited || showLapsed}
+        <div class="tabs">
+            <!-- svelte-ignore a11y-click-events-have-key-events -->
+            <div
+                tabindex="0"
+                role="button"
+                on:click={() => setView("members")}
+                class:selected={memberView === "members"}
+                class="tab sub">
+                <AccountMultiple
+                    size={"0.9em"}
+                    viewBox={"0 -2 24 24"}
+                    color={memberView === "members" ? "var(--txt)" : "var(--txt-light)"} />
+                <Translatable resourceKey={i18nKey("members")} />
+            </div>
+            {#if showInvited}
+                <!-- svelte-ignore a11y-click-events-have-key-events -->
+                <div
+                    tabindex="0"
+                    role="button"
+                    on:click={() => setView("invited")}
+                    class:selected={memberView === "invited"}
+                    class="tab sub">
+                    <AccountPlusOutline
+                        size={"0.9em"}
+                        viewBox={"0 -2 24 24"}
+                        color={memberView === "invited" ? "var(--txt)" : "var(--txt-light)"} />
+                    <Translatable resourceKey={i18nKey("invited")} />
+                </div>
+            {/if}
+
+            {#if showBlocked}
+                <!-- svelte-ignore a11y-click-events-have-key-events -->
+                <div
+                    tabindex="0"
+                    role="button"
+                    on:click={() => setView("blocked")}
+                    class:selected={memberView === "blocked"}
+                    class="tab sub">
+                    <Cancel
+                        size={"0.9em"}
+                        viewBox={"0 -2 24 24"}
+                        color={memberView === "blocked" ? "var(--txt)" : "var(--txt-light)"} />
+                    <Translatable resourceKey={i18nKey("blocked")} />
+                </div>
+            {/if}
+
+            {#if showLapsed}
+                <!-- svelte-ignore a11y-click-events-have-key-events -->
+                <div
+                    tabindex="0"
+                    role="button"
+                    on:click={() => setView("lapsed")}
+                    class:selected={memberView === "lapsed"}
+                    class="tab sub">
+                    <Alarm
+                        size={"0.9em"}
+                        viewBox={"0 -2 24 24"}
+                        color={memberView === "lapsed" ? "var(--txt)" : "var(--txt-light)"} />
+                    <Translatable resourceKey={i18nKey("access.lapsed.user")} />
+                </div>
+            {/if}
         </div>
     {/if}
 
@@ -274,6 +325,7 @@
         <div use:menuCloser class="user-list">
             {#each blockedUsers as user}
                 <BlockedUser
+                    me={user.userId === userId}
                     {user}
                     {searchTerm}
                     canUnblockUser={client.canUnblockUsers(collection.id)}
@@ -283,7 +335,18 @@
     {:else if memberView === "invited"}
         <div use:menuCloser class="user-list">
             {#each invitedUsers as user}
-                <InvitedUser {user} {searchTerm} canUninviteUser={client.canInviteUsers(collection.id)} on:cancelInvite />
+                <InvitedUser
+                    me={user.userId === userId}
+                    {user}
+                    {searchTerm}
+                    canUninviteUser={client.canInviteUsers(collection.id)}
+                    on:cancelInvite />
+            {/each}
+        </div>
+    {:else if memberView === "lapsed"}
+        <div use:menuCloser class="user-list">
+            {#each lapsedMembers as user}
+                <User me={user.userId === userId} {user} {searchTerm} />
             {/each}
         </div>
     {/if}
@@ -343,6 +406,10 @@
             &.selected {
                 color: var(--txt);
                 border-bottom: 3px solid var(--txt);
+
+                &.sub {
+                    border-bottom: 3px solid var(--accent);
+                }
             }
         }
     }
diff --git a/frontend/app/src/components/home/groupdetails/User.svelte b/frontend/app/src/components/home/groupdetails/User.svelte
index 6fe06522b0..1f3eaf2e1e 100644
--- a/frontend/app/src/components/home/groupdetails/User.svelte
+++ b/frontend/app/src/components/home/groupdetails/User.svelte
@@ -21,6 +21,7 @@
     export let searchTerm: string = "";
     export let role: string | undefined = undefined;
     export let profile = true;
+    export let lapsed = false;
 
     // if search term is !== "", split the username into three parts [prefix, match, postfix]
 
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 88ee04d0bd..59e4b8fba7 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -392,6 +392,7 @@
         user={$user}
         joining={undefined}
         preview={false}
+        lapsed={false}
         mode={"thread"}
         {blocked}
         on:joinGroup
diff --git a/frontend/app/src/i18n/cn.json b/frontend/app/src/i18n/cn.json
index a4a5459123..25ad247b42 100644
--- a/frontend/app/src/i18n/cn.json
+++ b/frontend/app/src/i18n/cn.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "为了加入这个{level}，您需要拥有钻石会员资格。",
         "diamondMember": "钻石会员",
         "doYouHaveUniquePersonCredential": "重要提示！在继续操作之前，请确认您已通过<a target='_blank' href='https://id.decideai.xyz'>DecideAI 网站</a>验证了您的独特身份。",
+        "evaluationInterval": "出入门评估间隔",
+        "evaluationIntervalInfo": "您可以选择强制定期重新评估您的访问权限。当成员的访问权限失效时，他们将无法与 {level} 互动，直到他们重新评估访问条件仍然满足为止。",
+        "evaluationIntervalSummary": "此通道门将每 {interval} 次重新评估一次",
         "gate": "门禁",
         "gateCheckFailed": "未满足访问门禁",
         "gateInvalid": "访问门无效",
         "join": "加入",
+        "lapsed": {
+            "label": "会员资格已失效",
+            "rejoin": "重新加入{level}",
+            "user": "孩子们"
+        },
         "lifetimeDiamondGateInfo": "只有终身钻石会员才允许加入",
         "lifetimeDiamondGateInfo2": "为了加入这个{level}，您需要拥有终身钻石会员资格。",
         "lifetimeDiamondMember": "终身钻石会员",
@@ -786,6 +794,7 @@
     "minimumAmount": "最小值：{amount} {symbol}",
     "minutes": "分钟",
     "moderator": "版主",
+    "months": "月份",
     "muted": "静默",
     "muteNotifications": "关闭通知",
     "myAccount": "我的帐户",
@@ -1615,6 +1624,7 @@
     "wallet": "钱包",
     "walletSettings": "钱包设置",
     "websiteVersion": "网站的",
+    "weeks": "周数",
     "whatsHot": "热门群聊",
     "whitepaper": "白皮书",
     "yes": "是的",
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index 6312c1807c..ab921a15d9 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Um diesem {level} beizutreten, müssen Sie eine Diamond-Mitgliedschaft besitzen.",
         "diamondMember": "Diamond-Mitgliedschaft",
         "doYouHaveUniquePersonCredential": "WICHTIG! Bitte bestätigen Sie, dass Sie Ihre einzigartige Persönlichkeit über <a target='_blank' href='https://id.decideai.xyz'>die DecideAI-Website</a> verifiziert haben, _bevor_ Sie fortfahren.",
+        "evaluationInterval": "Auswertungsintervall des Zugangstors",
+        "evaluationIntervalInfo": "Sie können die regelmäßige Neubewertung Ihres Zugangstors erzwingen. Wenn der Zugriff eines Mitglieds erlischt, kann es nicht mehr mit {level} interagieren, bis es erneut überprüft hat, ob die Zugriffsbedingungen noch erfüllt sind.",
+        "evaluationIntervalSummary": "Dieses Zugangstor wird alle {interval} neu bewertet.",
         "gate": "Zugangstor",
         "gateCheckFailed": "Zugangstor nicht erreicht",
         "gateInvalid": "Das Zugangstor ist ungültig",
         "join": "Verbinden",
+        "lapsed": {
+            "label": "Mitgliedschaft erloschen",
+            "rejoin": "Erneut beitreten {level}",
+            "user": "Kinder"
+        },
         "lifetimeDiamondGateInfo": "Nur Benutzer mit lebenslanger Diamond-Mitgliedschaft dürfen teilnehmen",
         "lifetimeDiamondGateInfo2": "Um diesem {level} beizutreten, ist eine lebenslange Diamant-Mitgliedschaft erforderlich.",
         "lifetimeDiamondMember": "Lebenslange Diamond-Mitgliedschaft",
@@ -786,6 +794,7 @@
     "minimumAmount": "Minimum: {amount} {symbol}",
     "minutes": "Protokoll",
     "moderator": "Moderator",
+    "months": "Monate",
     "muted": "stummgeschaltet",
     "muteNotifications": "Benachrichtigungen stummschalten",
     "myAccount": "Mein Konto",
@@ -1615,6 +1624,7 @@
     "wallet": "Wallet",
     "walletSettings": "Wallet-Einstellungen",
     "websiteVersion": "der Webseite",
+    "weeks": "Wochen",
     "whatsHot": "Was läuft?",
     "whitepaper": "Weißes Papier",
     "yes": "Ja",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index cfdbdc88c0..5e17b15f41 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "In order to join this {level} you are required to have Diamond membership.",
         "diamondMember": "Diamond membership",
         "doYouHaveUniquePersonCredential": "IMPORTANT! Please confirm that you have verified your unique personhood via <a target='_blank' href='https://id.decideai.xyz'>the DecideAI website</a> _before_ you proceed.",
+        "evaluationInterval": "Access gate evaluation interval",
+        "evaluationIntervalInfo": "You may choose to enforce the periodic re-evaluation of your access gate. When a member's access lapses, they will not be able to interact with the {level} until they have re-evaluated that the access conditions are still met.",
+        "evaluationIntervalSummary": "This access gate will be re-evaluated every {interval}",
         "gate": "Access gate",
         "gateCheckFailed": "Access gate not met",
         "gateInvalid": "Access gate is invalid",
         "join": "Join",
+        "lapsed": {
+            "label": "Membership lapsed",
+            "rejoin": "Re-join {level}",
+            "user": "Lapsed"
+        },
         "lifetimeDiamondGateInfo": "Only users with lifetime Diamond membership will be allowed to join",
         "lifetimeDiamondGateInfo2": "In order to join this {level} you are required to have lifetime Diamond membership.",
         "lifetimeDiamondMember": "Lifetime Diamond membership",
@@ -786,6 +794,7 @@
     "minimumAmount": "Minimum: {amount} {symbol}",
     "minutes": "Minutes",
     "moderator": "moderator",
+    "months": "Months",
     "muted": "muted",
     "muteNotifications": "Mute notifications",
     "myAccount": "My account",
@@ -1615,6 +1624,7 @@
     "wallet": "Wallet",
     "walletSettings": "Wallet settings",
     "websiteVersion": "of the website",
+    "weeks": "Weeks",
     "whatsHot": "What's hot?",
     "whitepaper": "Whitepaper",
     "yes": "Yes",
diff --git a/frontend/app/src/i18n/es.json b/frontend/app/src/i18n/es.json
index feffb7ba5d..feed896513 100644
--- a/frontend/app/src/i18n/es.json
+++ b/frontend/app/src/i18n/es.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Para unirse a este {level}, debe tener una membresía Diamond.",
         "diamondMember": "Membresía Diamante",
         "doYouHaveUniquePersonCredential": "¡IMPORTANTE! Confirme que ha verificado su personalidad única a través <a target='_blank' href='https://id.decideai.xyz'>del sitio web de DecideAI</a> _antes_ de continuar.",
+        "evaluationInterval": "Intervalo de evaluación de la puerta de acceso",
+        "evaluationIntervalInfo": "Puede optar por aplicar la reevaluación periódica de su puerta de acceso. Cuando el acceso de un miembro caduque, no podrá interactuar con {level} hasta que haya reevaluado que las condiciones de acceso aún se cumplan.",
+        "evaluationIntervalSummary": "Esta puerta de acceso se volverá a evaluar cada {interval}",
         "gate": "Puerta de acceso",
         "gateCheckFailed": "Puerta de acceso no cumplida",
         "gateInvalid": "La puerta de acceso no es válida",
         "join": "Unirse",
+        "lapsed": {
+            "label": "La membresía caducó",
+            "rejoin": "Volver a unirse a {level}",
+            "user": "Niños"
+        },
         "lifetimeDiamondGateInfo": "Solo los usuarios con membresía Diamond vitalicia podrán unirse",
         "lifetimeDiamondGateInfo2": "Para unirse a este {level}, debe tener una membresía Diamond de por vida.",
         "lifetimeDiamondMember": "Membresía Diamante de por vida",
@@ -786,6 +794,7 @@
     "minimumAmount": "Mínimo: {amount} {symbol}",
     "minutes": "Minutos",
     "moderator": "moderador",
+    "months": "Meses",
     "muted": "silenciado",
     "muteNotifications": "Silenciar notificaciones",
     "myAccount": "Mi cuenta",
@@ -1615,6 +1624,7 @@
     "wallet": "Cartera",
     "walletSettings": "Configuración de billetera",
     "websiteVersion": "del sitio web",
+    "weeks": "Semanas",
     "whatsHot": "Recomendaciones",
     "whitepaper": "Papel blanco",
     "yes": "Sí",
diff --git a/frontend/app/src/i18n/fa.json b/frontend/app/src/i18n/fa.json
index 344c3d186c..50eb977157 100644
--- a/frontend/app/src/i18n/fa.json
+++ b/frontend/app/src/i18n/fa.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "برای پیوستن به این {level} باید عضویت Diamond داشته باشید.",
         "diamondMember": "عضویت الماس",
         "doYouHaveUniquePersonCredential": "مهم! لطفاً قبل از ادامه، تأیید کنید که شخصیت منحصر به فرد خود را از طریق <a target='_blank' href='https://id.decideai.xyz'>وب سایت DecideAI</a> تأیید کرده اید.",
+        "evaluationInterval": "فاصله ارزیابی دروازه دسترسی",
+        "evaluationIntervalInfo": "می توانید ارزیابی مجدد دوره ای دروازه دسترسی خود را اعمال کنید. هنگامی که دسترسی یک عضو از بین می‌رود، تا زمانی که مجدداً ارزیابی نکند که شرایط دسترسی هنوز رعایت شده است، نمی‌تواند با {level} تعامل داشته باشد.",
+        "evaluationIntervalSummary": "این دروازه دسترسی هر {interval} دوباره ارزیابی می‌شود",
         "gate": "دروازه دسترسی",
         "gateCheckFailed": "دروازه دسترسی برقرار نشد",
         "gateInvalid": "دروازه دسترسی نامعتبر است",
         "join": "پیوستن",
+        "lapsed": {
+            "label": "عضویت از بین رفت",
+            "rejoin": "پیوستن مجدد به {level}",
+            "user": "بچه ها"
+        },
         "lifetimeDiamondGateInfo": "فقط کاربران با عضویت مادام العمر الماس مجاز به پیوستن خواهند بود",
         "lifetimeDiamondGateInfo2": "برای پیوستن به این {level} باید عضویت دایموند مادام العمر داشته باشید.",
         "lifetimeDiamondMember": "عضویت مادام العمر الماس",
@@ -786,6 +794,7 @@
     "minimumAmount": "حداقل: {amount} {symbol}",
     "minutes": "دقایق",
     "moderator": "ناظم",
+    "months": "ماه ها",
     "muted": "خاموش",
     "muteNotifications": "نادیده گرفتن اعلان ها",
     "myAccount": "حساب من",
@@ -1615,6 +1624,7 @@
     "wallet": "کیف پول",
     "walletSettings": "تنظیمات کیف پول",
     "websiteVersion": "از وب سایت",
+    "weeks": "هفته ها",
     "whatsHot": "چه داغ است؟",
     "whitepaper": "کاغذ سفید",
     "yes": "آره",
diff --git a/frontend/app/src/i18n/fr.json b/frontend/app/src/i18n/fr.json
index f2bbdea5ef..b9290b30db 100644
--- a/frontend/app/src/i18n/fr.json
+++ b/frontend/app/src/i18n/fr.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Pour rejoindre ce {level}, vous devez être membre Diamond.",
         "diamondMember": "Adhésion Diamant",
         "doYouHaveUniquePersonCredential": "IMPORTANT! Veuillez confirmer que vous avez vérifié votre personnalité unique via <a target='_blank' href='https://id.decideai.xyz'>le site Web DecideAI</a> _avant_ de continuer.",
+        "evaluationInterval": "Intervalle d'évaluation de la porte d'accès",
+        "evaluationIntervalInfo": "Vous pouvez choisir d'appliquer la réévaluation périodique de votre portail d'accès. Lorsque l'accès d'un membre expire, il ne pourra pas interagir avec {level} tant qu'il n'aura pas réévalué que les conditions d'accès sont toujours remplies.",
+        "evaluationIntervalSummary": "Cette porte d'accès sera réévaluée tous les {interval}",
         "gate": "Porte d'accès",
         "gateCheckFailed": "Porte d'accès non rencontrée",
         "gateInvalid": "La porte d'accès n'est pas valide",
         "join": "Rejoindre",
+        "lapsed": {
+            "label": "Adhésion expirée",
+            "rejoin": "Rejoindre {level}",
+            "user": "Enfants"
+        },
         "lifetimeDiamondGateInfo": "Seuls les utilisateurs disposant d'un abonnement Diamond à vie seront autorisés à rejoindre",
         "lifetimeDiamondGateInfo2": "Pour rejoindre ce {level}, vous devez être membre Diamond à vie.",
         "lifetimeDiamondMember": "Adhésion Diamant à vie",
@@ -786,6 +794,7 @@
     "minimumAmount": "Minimum: {amount} {symbol}",
     "minutes": "Minutes",
     "moderator": "modérateur",
+    "months": "Mois",
     "muted": "en sourdine",
     "muteNotifications": "Désactiver les notifications",
     "myAccount": "Mon compte",
@@ -1615,6 +1624,7 @@
     "wallet": "Portefeuille",
     "walletSettings": "Paramètres du portefeuille",
     "websiteVersion": "du site web",
+    "weeks": "Semaines",
     "whatsHot": "Ce qui est chaud?",
     "whitepaper": "Papier blanc",
     "yes": "Oui",
diff --git a/frontend/app/src/i18n/hi.json b/frontend/app/src/i18n/hi.json
index b981eec76c..ab274a7c16 100644
--- a/frontend/app/src/i18n/hi.json
+++ b/frontend/app/src/i18n/hi.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "इस {level} में शामिल होने के लिए आपके पास डायमंड सदस्यता होना आवश्यक है।",
         "diamondMember": "हीरे की सदस्यता",
         "doYouHaveUniquePersonCredential": "महत्वपूर्ण! कृपया पुष्टि करें कि आपने आगे बढ़ने से पहले <a target='_blank' href='https://id.decideai.xyz'>DecideAI वेबसाइट</a> के माध्यम से अपने अद्वितीय व्यक्तित्व को सत्यापित कर लिया है।",
+        "evaluationInterval": "प्रवेश द्वार मूल्यांकन अंतराल",
+        "evaluationIntervalInfo": "आप अपने एक्सेस गेट का समय-समय पर पुनर्मूल्यांकन लागू करने का विकल्प चुन सकते हैं। जब किसी सदस्य की एक्सेस समाप्त हो जाती है, तो वे {level} के साथ तब तक बातचीत नहीं कर पाएंगे, जब तक कि वे यह पुनर्मूल्यांकन नहीं कर लेते कि एक्सेस की शर्तें अभी भी पूरी हो रही हैं।",
+        "evaluationIntervalSummary": "इस प्रवेश द्वार का हर {interval} पर पुनः मूल्यांकन किया जाएगा",
         "gate": "प्रवेश द्वार",
         "gateCheckFailed": "प्रवेश द्वार नहीं मिला",
         "gateInvalid": "प्रवेश द्वार अमान्य है",
         "join": "जोड़ना",
+        "lapsed": {
+            "label": "सदस्यता समाप्त",
+            "rejoin": "{level} से पुनः जुड़ें",
+            "user": "बच्चे"
+        },
         "lifetimeDiamondGateInfo": "केवल आजीवन डायमंड सदस्यता वाले उपयोगकर्ताओं को ही इसमें शामिल होने की अनुमति होगी",
         "lifetimeDiamondGateInfo2": "इस {level} में शामिल होने के लिए आपके पास आजीवन डायमंड सदस्यता होना आवश्यक है।",
         "lifetimeDiamondMember": "आजीवन डायमंड सदस्यता",
@@ -786,6 +794,7 @@
     "minimumAmount": "न्यूनतम: {amount} {symbol}",
     "minutes": "मिनट",
     "moderator": "मध्यस्थ",
+    "months": "महीने",
     "muted": "मौन कर दिया गया",
     "muteNotifications": "सूचनाएं म्यूट करें",
     "myAccount": "मेरा खाता",
@@ -1615,6 +1624,7 @@
     "wallet": "वॉलेट",
     "walletSettings": "वॉलेट सेटिंग",
     "websiteVersion": "वेबसाइट का",
+    "weeks": "हफ्तों",
     "whatsHot": "नवीनतम क्या है?",
     "whitepaper": "सफेद कागज",
     "yes": "हाँ",
diff --git a/frontend/app/src/i18n/it.json b/frontend/app/src/i18n/it.json
index fe0f8154f4..2138a44162 100644
--- a/frontend/app/src/i18n/it.json
+++ b/frontend/app/src/i18n/it.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Per iscriverti a questo {level} devi avere l'abbonamento Diamond.",
         "diamondMember": "Adesione diamante",
         "doYouHaveUniquePersonCredential": "IMPORTANTE! Conferma di aver verificato la tua personalità unica tramite <a target='_blank' href='https://id.decideai.xyz'>il sito web DecideAI</a> _prima_ di procedere.",
+        "evaluationInterval": "Intervallo di valutazione del gate di accesso",
+        "evaluationIntervalInfo": "Puoi scegliere di imporre la rivalutazione periodica del tuo gate di accesso. Quando l'accesso di un membro scade, non sarà in grado di interagire con {level} finché non avrà rivalutato che le condizioni di accesso sono ancora soddisfatte.",
+        "evaluationIntervalSummary": "Questo gate di accesso verrà rivalutato ogni {interval}",
         "gate": "Cancello di accesso",
         "gateCheckFailed": "Cancello di accesso non rispettato",
         "gateInvalid": "Il cancello di accesso non è valido",
         "join": "Giuntura",
+        "lapsed": {
+            "label": "L'iscrizione è scaduta",
+            "rejoin": "Rientra in {level}",
+            "user": "Bambini"
+        },
         "lifetimeDiamondGateInfo": "Solo gli utenti con abbonamento Diamond a vita potranno iscriversi",
         "lifetimeDiamondGateInfo2": "Per iscriverti a questo {level} devi avere un abbonamento Diamond a vita.",
         "lifetimeDiamondMember": "Abbonamento Diamond a vita",
@@ -786,6 +794,7 @@
     "minimumAmount": "Minimo: {amount} {symbol}",
     "minutes": "Minuti",
     "moderator": "moderatore",
+    "months": "Mesi",
     "muted": "muto",
     "muteNotifications": "Notifiche mute",
     "myAccount": "Il mio account",
@@ -1615,6 +1624,7 @@
     "wallet": "Portafoglio",
     "walletSettings": "Impostazioni del portafoglio",
     "websiteVersion": "del sito web",
+    "weeks": "Settimane",
     "whatsHot": "Cosa c'è di nuovo?",
     "whitepaper": "Carta bianca",
     "yes": "sì",
diff --git a/frontend/app/src/i18n/iw.json b/frontend/app/src/i18n/iw.json
index 908e237b04..32d7cd99f2 100644
--- a/frontend/app/src/i18n/iw.json
+++ b/frontend/app/src/i18n/iw.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "כדי להצטרף ל-{level} הזה אתה נדרש להיות חבר ב-Diamond.",
         "diamondMember": "חברות יהלום",
         "doYouHaveUniquePersonCredential": "חָשׁוּב! אנא אשר כי אימתת את אישיותך הייחודית באמצעות <a target='_blank' href='https://id.decideai.xyz'>אתר DecideAI</a> _לפני_ שתמשיך.",
+        "evaluationInterval": "מרווח הערכת שער גישה",
+        "evaluationIntervalInfo": "אתה יכול לבחור לאכוף את ההערכה מחדש התקופתית של שער הגישה שלך. כאשר הגישה של חבר פוסלת, הוא לא יוכל לקיים אינטראקציה עם ה-{level} עד שהם יערכו מחדש שתנאי הגישה עדיין מתקיימים.",
+        "evaluationIntervalSummary": "שער גישה זה יוערך מחדש בכל {interval}",
         "gate": "שער גישה",
         "gateCheckFailed": "שער הגישה לא נפגש",
         "gateInvalid": "שער הגישה אינו חוקי",
         "join": "לְהִצְטַרֵף",
+        "lapsed": {
+            "label": "החברות פג",
+            "rejoin": "הצטרף מחדש ל-{level}",
+            "user": "יְלָדִים"
+        },
         "lifetimeDiamondGateInfo": "רק משתמשים עם חברות Diamond לכל החיים יורשו להצטרף",
         "lifetimeDiamondGateInfo2": "על מנת להצטרף ל-{level} הזה, עליך להיות בעל חברות Diamond לכל החיים.",
         "lifetimeDiamondMember": "חברות יהלום לכל החיים",
@@ -786,6 +794,7 @@
     "minimumAmount": "מינימום: {amount} {symbol}",
     "minutes": "דקות",
     "moderator": "מַנחֶה",
+    "months": "חודשים",
     "muted": "מושתק",
     "muteNotifications": "השתק התראות",
     "myAccount": "החשבון שלי",
@@ -1615,6 +1624,7 @@
     "wallet": "ארנק",
     "walletSettings": "הגדרות ארנק",
     "websiteVersion": "של האתר",
+    "weeks": "שבועות",
     "whatsHot": "מה לוהט?",
     "whitepaper": "נייר לבן",
     "yes": "כן",
diff --git a/frontend/app/src/i18n/jp.json b/frontend/app/src/i18n/jp.json
index 8252d95a83..9bf712389b 100644
--- a/frontend/app/src/i18n/jp.json
+++ b/frontend/app/src/i18n/jp.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "この {level} に参加するには、ダイヤモンド メンバーシップが必要です。",
         "diamondMember": "ダイヤモンド会員",
         "doYouHaveUniquePersonCredential": "重要! 続行する前に、 <a target='_blank' href='https://id.decideai.xyz'>DecideAI Web サイト</a>を通じて自分の固有の人物であることを確認しておいてください。",
+        "evaluationInterval": "アクセスゲート評価間隔",
+        "evaluationIntervalInfo": "アクセス ゲートの定期的な再評価を強制することもできます。メンバーのアクセスが失効すると、アクセス条件がまだ満たされていることを再評価するまで、メンバーは {level} とやり取りできなくなります。",
+        "evaluationIntervalSummary": "このアクセスゲートは{interval}ごとに再評価されます",
         "gate": "アクセスゲート",
         "gateCheckFailed": "アクセスゲートが満たされていません",
         "gateInvalid": "アクセスゲートが無効です",
         "join": "参加する",
+        "lapsed": {
+            "label": "会員資格が失効しました",
+            "rejoin": "{level} に再参加",
+            "user": "子供たち"
+        },
         "lifetimeDiamondGateInfo": "生涯ダイヤモンド会員のみ参加できます",
         "lifetimeDiamondGateInfo2": "この {level} に参加するには、生涯ダイヤモンド メンバーシップが必要です。",
         "lifetimeDiamondMember": "生涯ダイヤモンド会員",
@@ -786,6 +794,7 @@
     "minimumAmount": "最小値: {amount} {symbol}",
     "minutes": "分",
     "moderator": "モデレータ",
+    "months": "月",
     "muted": "ミュート",
     "muteNotifications": "通知をミュートする",
     "myAccount": "マイアカウント",
@@ -1615,6 +1624,7 @@
     "wallet": "ウォレット",
     "walletSettings": "ウォレット設定",
     "websiteVersion": "ウェブサイト",
+    "weeks": "週",
     "whatsHot": "何がｷﾃｲﾙ？",
     "whitepaper": "ホワイトペーパー",
     "yes": "はい",
diff --git a/frontend/app/src/i18n/pl.json b/frontend/app/src/i18n/pl.json
index fdb8a45d3d..3ef6f71e8d 100644
--- a/frontend/app/src/i18n/pl.json
+++ b/frontend/app/src/i18n/pl.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Aby dołączyć do tego {level}, musisz mieć członkostwo Diamentowe.",
         "diamondMember": "Członkostwo diamentowe",
         "doYouHaveUniquePersonCredential": "WAŻNY! Przed kontynuowaniem potwierdź, że zweryfikowałeś swoją wyjątkową osobowość za pośrednictwem <a target='_blank' href='https://id.decideai.xyz'>witryny DecideAI</a> .",
+        "evaluationInterval": "Interwał oceny bramy dostępowej",
+        "evaluationIntervalInfo": "Możesz zdecydować się na wymuszenie okresowej ponownej oceny swojej bramki dostępu. Gdy dostęp członka wygaśnie, nie będzie on mógł wchodzić w interakcję z {level}, dopóki nie dokona ponownej oceny, czy warunki dostępu są nadal spełnione.",
+        "evaluationIntervalSummary": "Ta bramka dostępowa będzie ponownie oceniana co {interval}",
         "gate": "Brama dostępowa",
         "gateCheckFailed": "Brama dostępu nie została spełniona",
         "gateInvalid": "Brama dostępu jest nieprawidłowa",
         "join": "Dołączyć",
+        "lapsed": {
+            "label": "Członkostwo wygasło",
+            "rejoin": "Dołącz ponownie do {level}",
+            "user": "Dzieci"
+        },
         "lifetimeDiamondGateInfo": "Tylko użytkownicy z dożywotnim członkostwem Diamentowym będą mogli dołączyć",
         "lifetimeDiamondGateInfo2": "Aby dołączyć do tego {level}, musisz mieć dożywotnie członkostwo Diamentowe.",
         "lifetimeDiamondMember": "Dożywotnie członkostwo Diamentowe",
@@ -786,6 +794,7 @@
     "minimumAmount": "Minimum: {amount} {symbol}",
     "minutes": "Minuty",
     "moderator": "moderator",
+    "months": "Miesiące",
     "muted": "wyciszony",
     "muteNotifications": "Wycisz powiadomienia",
     "myAccount": "Moje konto",
@@ -1615,6 +1624,7 @@
     "wallet": "Portfel",
     "walletSettings": "Ustawienia portfela",
     "websiteVersion": "strony internetowej",
+    "weeks": "Tygodnie",
     "whatsHot": "Co jest na topie?",
     "whitepaper": "Biały papier",
     "yes": "Tak",
diff --git a/frontend/app/src/i18n/ru.json b/frontend/app/src/i18n/ru.json
index 3f93aefa6a..3b11e4b17a 100644
--- a/frontend/app/src/i18n/ru.json
+++ b/frontend/app/src/i18n/ru.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Чтобы присоединиться к {level}, вам необходимо иметь статус Diamond.",
         "diamondMember": "Бриллиантовое членство",
         "doYouHaveUniquePersonCredential": "ВАЖНЫЙ! Прежде чем продолжить, подтвердите, что вы подтвердили свою уникальную личность на <a target='_blank' href='https://id.decideai.xyz'>веб-сайте DecideAI</a> .",
+        "evaluationInterval": "Интервал оценки пропускного режима",
+        "evaluationIntervalInfo": "Вы можете выбрать принудительное проведение периодической переоценки вашего шлюза доступа. Когда доступ участника истекает, он не сможет взаимодействовать с {level}, пока не произведет переоценку и не убедится, что условия доступа по-прежнему выполняются.",
+        "evaluationIntervalSummary": "Этот пропускной режим будет переоцениваться каждые {interval}",
         "gate": "Въездные ворота",
         "gateCheckFailed": "Въездные ворота не выполнены",
         "gateInvalid": "Ворота доступа недействительны",
         "join": "Присоединиться",
+        "lapsed": {
+            "label": "Членство истекло",
+            "rejoin": "Повторно присоединиться к {level}",
+            "user": "Дети"
+        },
         "lifetimeDiamondGateInfo": "Присоединиться смогут только пользователи с пожизненным статусом Diamond.",
         "lifetimeDiamondGateInfo2": "Чтобы присоединиться к {level}, вам необходимо иметь пожизненное членство со статусом Diamond.",
         "lifetimeDiamondMember": "Пожизненное членство со статусом Diamond",
@@ -786,6 +794,7 @@
     "minimumAmount": "Минимум: {amount} {symbol}",
     "minutes": "Минуты",
     "moderator": "Модератор",
+    "months": "Месяцы",
     "muted": "без звука",
     "muteNotifications": "Отключить звук уведомления",
     "myAccount": "Мой аккаунт",
@@ -1615,6 +1624,7 @@
     "wallet": "Кошелек",
     "walletSettings": "Настройки кошелька",
     "websiteVersion": "веб-сайта",
+    "weeks": "Недели",
     "whatsHot": "Популярное",
     "whitepaper": "Белая бумага",
     "yes": "Да",
diff --git a/frontend/app/src/i18n/uk.json b/frontend/app/src/i18n/uk.json
index b4a9f22138..496f5aa09a 100644
--- a/frontend/app/src/i18n/uk.json
+++ b/frontend/app/src/i18n/uk.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Щоб приєднатися до {level}, ви повинні мати діамантове членство.",
         "diamondMember": "Діамантове членство",
         "doYouHaveUniquePersonCredential": "ВАЖЛИВО! Будь ласка, підтвердьте, що ви підтвердили свою унікальну особистість на <a target='_blank' href='https://id.decideai.xyz'>веб-сайті DecideAI</a> _перш ніж_ продовжити.",
+        "evaluationInterval": "Інтервал оцінки воріт доступу",
+        "evaluationIntervalInfo": "Ви можете примусово проводити періодичну повторну оцінку воріт доступу. Коли доступ учасника закінчується, він не зможе взаємодіяти з {level}, доки не переконається, що умови доступу досі виконуються.",
+        "evaluationIntervalSummary": "Цей шлюз доступу буде переоцінюватись кожні {interval}",
         "gate": "Під’їздні ворота",
         "gateCheckFailed": "Ворота доступу не зустрічаються",
         "gateInvalid": "Ворота доступу недійсні",
         "join": "Приєднуйтесь",
+        "lapsed": {
+            "label": "Членство припинено",
+            "rejoin": "Повторно приєднатися до {level}",
+            "user": "діти"
+        },
         "lifetimeDiamondGateInfo": "Приєднатися зможуть лише користувачі з довічним членством Diamond",
         "lifetimeDiamondGateInfo2": "Щоб приєднатися до цього {level}, ви повинні мати довічне Діамантове членство.",
         "lifetimeDiamondMember": "Довічне Діамантове членство",
@@ -786,6 +794,7 @@
     "minimumAmount": "Мінімум: {amount} {symbol}",
     "minutes": "хвилин",
     "moderator": "модератор",
+    "months": "Місяці",
     "muted": "приглушено",
     "muteNotifications": "Вимкнути сповіщення",
     "myAccount": "Мій рахунок",
@@ -1615,6 +1624,7 @@
     "wallet": "Гаманець",
     "walletSettings": "Налаштування гаманця",
     "websiteVersion": "веб-сайту",
+    "weeks": "тижнів",
     "whatsHot": "Що цікавого?",
     "whitepaper": "Whitepaper",
     "yes": "Так",
diff --git a/frontend/app/src/i18n/vi.json b/frontend/app/src/i18n/vi.json
index 53a99beb95..5fa146a34a 100644
--- a/frontend/app/src/i18n/vi.json
+++ b/frontend/app/src/i18n/vi.json
@@ -43,10 +43,18 @@
         "diamondGateInfo2": "Để tham gia {level} này, bạn bắt buộc phải có tư cách thành viên Kim cương.",
         "diamondMember": "thành viên kim cương",
         "doYouHaveUniquePersonCredential": "QUAN TRỌNG! Vui lòng xác nhận rằng bạn đã xác minh tư cách cá nhân duy nhất của mình thông qua <a target='_blank' href='https://id.decideai.xyz'>trang web DecisionAI</a> _trước khi_ bạn tiếp tục.",
+        "evaluationInterval": "Khoảng thời gian đánh giá cổng truy cập",
+        "evaluationIntervalInfo": "Bạn có thể chọn thực thi đánh giá lại định kỳ cổng truy cập của mình. Khi quyền truy cập của thành viên hết hạn, họ sẽ không thể tương tác với {level} cho đến khi họ đánh giá lại rằng các điều kiện truy cập vẫn được đáp ứng.",
+        "evaluationIntervalSummary": "Cổng truy cập này sẽ được đánh giá lại sau mỗi {interval}",
         "gate": "cổng ra vào",
         "gateCheckFailed": "Cổng truy cập không được đáp ứng",
         "gateInvalid": "Cổng truy cập không hợp lệ",
         "join": "Tham gia",
+        "lapsed": {
+            "label": "Thành viên đã hết hạn",
+            "rejoin": "Tham gia lại {level}",
+            "user": "Những đứa trẻ"
+        },
         "lifetimeDiamondGateInfo": "Chỉ những người dùng có tư cách thành viên Kim cương trọn đời mới được phép tham gia",
         "lifetimeDiamondGateInfo2": "Để tham gia {level} này, bạn bắt buộc phải có tư cách thành viên Kim cương trọn đời.",
         "lifetimeDiamondMember": "Thành viên kim cương trọn đời",
@@ -786,6 +794,7 @@
     "minimumAmount": "Tối thiểu: {amount} {symbol}",
     "minutes": "Phút",
     "moderator": "người điều hành",
+    "months": "Tháng",
     "muted": "Đã tắt tiếng",
     "muteNotifications": "Ẩn thông báo",
     "myAccount": "Tài khoản",
@@ -1615,6 +1624,7 @@
     "wallet": "Cái ví",
     "walletSettings": "Cài đặt ví",
     "websiteVersion": "của trang web",
+    "weeks": "Tuần",
     "whatsHot": "Nhóm đang HOT🔥",
     "whitepaper": "Giấy trắng",
     "yes": "Đúng",
diff --git a/frontend/app/src/stores/community.ts b/frontend/app/src/stores/community.ts
index 66f2fa1739..54ab9bfa5a 100644
--- a/frontend/app/src/stores/community.ts
+++ b/frontend/app/src/stores/community.ts
@@ -23,7 +23,7 @@ export function createCandidateCommunity(id: string, index: number): CommunitySu
         memberCount: 0,
         avatar: {},
         banner: {},
-        gate: { kind: "no_gate" },
+        gateConfig: { gate: { kind: "no_gate" }, expiry: undefined },
         public: true,
         permissions: defaultPermissions,
         historyVisible: true,
@@ -40,6 +40,7 @@ export function createCandidateCommunity(id: string, index: number): CommunitySu
             index,
             displayName: undefined,
             rulesAccepted: false,
+            lapsed: false,
         },
         primaryLanguage: "en",
         metrics: emptyChatMetrics(),
diff --git a/frontend/app/src/utils/time.ts b/frontend/app/src/utils/time.ts
new file mode 100644
index 0000000000..7f54d89b74
--- /dev/null
+++ b/frontend/app/src/utils/time.ts
@@ -0,0 +1,21 @@
+import { ONE_DAY, ONE_HOUR, ONE_MINUTE_MILLIS, ONE_MONTH, ONE_WEEK } from "openchat-client";
+
+export function msToMinutes(ms: number): number {
+    return Math.floor(ms / ONE_MINUTE_MILLIS);
+}
+
+export function msToHours(ms: number): number {
+    return Math.floor(ms / ONE_HOUR);
+}
+
+export function msToDays(ms: number): number {
+    return Math.floor(ms / ONE_DAY);
+}
+
+export function msToWeeks(ms: number): number {
+    return Math.floor(ms / ONE_WEEK);
+}
+
+export function msToMonths(ms: number): number {
+    return Math.floor(ms / ONE_MONTH);
+}
diff --git a/frontend/openchat-agent/src/services/candidService.ts b/frontend/openchat-agent/src/services/candidService.ts
index 8436a28962..d2ddf4dadd 100644
--- a/frontend/openchat-agent/src/services/candidService.ts
+++ b/frontend/openchat-agent/src/services/candidService.ts
@@ -256,8 +256,13 @@ export abstract class CandidService {
         validator: Resp,
     ): Out {
         const response = Packer.unpack(new Uint8Array(responseBytes));
-        const validated = CandidService.validate(response, validator);
-        return mapper(validated);
+        try {
+            const validated = CandidService.validate(response, validator);
+            return mapper(validated);
+        } catch (err) {
+            console.error("Validation failed for response: ", response);
+            throw err;
+        }
     }
 
     constructor(
diff --git a/frontend/openchat-agent/src/services/common/chatMappers.ts b/frontend/openchat-agent/src/services/common/chatMappers.ts
index 972ae89c99..53bb71dc5a 100644
--- a/frontend/openchat-agent/src/services/common/chatMappers.ts
+++ b/frontend/openchat-agent/src/services/common/chatMappers.ts
@@ -1505,9 +1505,17 @@ export function apiOptional<D, A>(mapper: (d: D) => A, domain: D | undefined): [
     return domain !== undefined ? [mapper(domain)] : [];
 }
 
-export function apiMaybeAccessGateConfig(domain: AccessGate): [] | [ApiAccessGateConfig] {
-    const gate = apiMaybeAccessGate(domain);
-    return gate.length === 0 ? [] : [{ gate: gate[0], expiry: [] }];
+export function apiMaybeAccessGateConfig(domain: AccessGateConfig): [] | [ApiAccessGateConfig] {
+    const gate = apiMaybeAccessGate(domain.gate);
+    if (gate.length === 0) {
+        return [];
+    }
+    return [
+        {
+            gate: gate[0],
+            expiry: apiOptional(identity, domain.expiry),
+        },
+    ];
 }
 
 export function apiMaybeAccessGate(domain: AccessGate): [] | [ApiAccessGate] {
@@ -1669,6 +1677,13 @@ function apiCredentialArguments(
     });
 }
 
+export function accessGateConfig(candid: ApiAccessGateConfig): AccessGateConfig {
+    return {
+        gate: accessGate(candid.gate),
+        expiry: optional(candid.expiry, identity),
+    };
+}
+
 export function accessGate(candid: ApiAccessGate): AccessGate {
     if ("Composite" in candid) {
         return {
diff --git a/frontend/openchat-agent/src/services/common/chatMappersV2.ts b/frontend/openchat-agent/src/services/common/chatMappersV2.ts
index 6b7fb63ae2..ecfdf8431d 100644
--- a/frontend/openchat-agent/src/services/common/chatMappersV2.ts
+++ b/frontend/openchat-agent/src/services/common/chatMappersV2.ts
@@ -1587,6 +1587,17 @@ function apiAudioContent(domain: AudioContent): TAudioContent {
     };
 }
 
+export function apiMaybeAccessGateConfig(domain: AccessGateConfig): TAccessGateConfig | undefined {
+    const gate = apiMaybeAccessGate(domain.gate);
+    if (gate === undefined) {
+        return undefined;
+    }
+    return {
+        gate,
+        expiry: domain.expiry,
+    };
+}
+
 export function apiMaybeAccessGate(domain: AccessGate): TAccessGate | undefined {
     if (domain.kind === "composite_gate") {
         return {
@@ -1737,6 +1748,13 @@ function apiCredentialArguments(
     );
 }
 
+export function accessGateConfig(value: TAccessGateConfig): AccessGateConfig {
+    return {
+        gate: accessGate(value.gate),
+        expiry: value.expiry,
+    };
+}
+
 export function accessGate(value: TAccessGate): AccessGate {
     if (value === "DiamondMember") {
         return {
@@ -1995,7 +2013,10 @@ export function groupChatSummary(value: TGroupCanisterGroupChatSummary): GroupCh
         frozen: value.frozen !== undefined,
         dateLastPinned: value.date_last_pinned,
         dateReadPinned: undefined,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            gate: { kind: "no_gate" },
+            expiry: undefined,
+        },
         level: "group",
         eventsTTL: value.events_ttl,
         eventsTtlLastUpdated: value.events_ttl_last_updated,
@@ -2009,6 +2030,7 @@ export function groupChatSummary(value: TGroupCanisterGroupChatSummary): GroupCh
             readByMeUpTo: latestMessage?.event.messageIndex,
             archived: false,
             rulesAccepted: value.rules_accepted,
+            lapsed: value.membership?.lapsed ?? false,
         },
         localUserIndex: principalBytesToString(value.local_user_index_canister_id),
         isInvited: false, // this is only applicable when we are not a member
@@ -2043,7 +2065,10 @@ export function communitySummary(value: TCommunityCanisterCommunitySummary): Com
         },
         memberCount: value.member_count,
         frozen: value.frozen !== undefined,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            gate: { kind: "no_gate" },
+            expiry: undefined,
+        },
         level: "community",
         permissions: communityPermissions(value.permissions),
         membership: {
@@ -2054,6 +2079,7 @@ export function communitySummary(value: TCommunityCanisterCommunitySummary): Com
             index: 0,
             displayName: mapOptional(value.membership, (m) => m.display_name),
             rulesAccepted: mapOptional(value.membership, (m) => m.rules_accepted) ?? false,
+            lapsed: mapOptional(value.membership, (m) => m.lapsed) ?? false,
         },
         channels: value.channels.map((c) => communityChannelSummary(c, communityId)),
         primaryLanguage: value.primary_language,
@@ -2104,7 +2130,10 @@ export function communityChannelSummary(
         frozen: false, // TODO - doesn't exist
         dateLastPinned: value.date_last_pinned,
         dateReadPinned: undefined,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            gate: { kind: "no_gate" },
+            expiry: undefined,
+        },
         level: "channel",
         eventsTTL: value.events_ttl,
         eventsTtlLastUpdated: value.events_ttl_last_updated,
@@ -2123,6 +2152,7 @@ export function communityChannelSummary(
             mentions: [],
             archived: false,
             rulesAccepted: mapOptional(value.membership, (m) => m.rules_accepted) ?? false,
+            lapsed: mapOptional(value.membership, (m) => m.lapsed) ?? false,
         },
         isInvited: value.is_invited ?? false,
         messagesVisibleToNonMembers: value.messages_visible_to_non_members,
@@ -2176,16 +2206,18 @@ export function gateCheckFailedReason(value: TGateCheckFailedReason): GateCheckF
     if (value === "Locked") {
         return "locked";
     }
-    if ("PaymentFailed" in value) {
-        console.warn("PaymentFailed: ", value);
-        return "payment_failed";
-    }
-    if ("InsufficientBalance" in value) {
-        return "insufficient_balance";
-    }
-    if ("FailedVerifiedCredentialCheck" in value) {
-        console.warn("FailedVerifiedCredentialCheck: ", value);
-        return "failed_verified_credential_check";
+    if (typeof value !== "string") {
+        if ("PaymentFailed" in value) {
+            console.warn("PaymentFailed: ", value);
+            return "payment_failed";
+        }
+        if ("InsufficientBalance" in value) {
+            return "insufficient_balance";
+        }
+        if ("FailedVerifiedCredentialCheck" in value) {
+            console.warn("FailedVerifiedCredentialCheck: ", value);
+            return "failed_verified_credential_check";
+        }
     }
     throw new UnsupportedValueError("Unexpected ApiGateCheckFailedReason type received", value);
 }
@@ -2482,8 +2514,9 @@ export function groupDetailsResponse(
         return "failure";
     }
     if ("Success" in value) {
-        const members =
-            ("participants" in value.Success ? value.Success.participants : value.Success.members).map(member);
+        const members = (
+            "participants" in value.Success ? value.Success.participants : value.Success.members
+        ).map(member);
 
         const basicMembers = "basic_members" in value.Success ? value.Success.basic_members : [];
         const membersSet = new Set<string>();
@@ -2495,6 +2528,7 @@ export function groupDetailsResponse(
                     role: "member",
                     userId,
                     displayName: undefined,
+                    lapsed: false,
                 });
             }
         }
@@ -2550,6 +2584,7 @@ export function member(value: TGroupMember): Member {
         role: memberRole(value.role),
         userId: principalBytesToString(value.user_id),
         displayName: undefined,
+        lapsed: value.lapsed,
     };
 }
 
diff --git a/frontend/openchat-agent/src/services/common/publicSummaryMapperV2.ts b/frontend/openchat-agent/src/services/common/publicSummaryMapperV2.ts
index 093e0f0675..e5f5747f4b 100644
--- a/frontend/openchat-agent/src/services/common/publicSummaryMapperV2.ts
+++ b/frontend/openchat-agent/src/services/common/publicSummaryMapperV2.ts
@@ -1,6 +1,6 @@
 import { emptyChatMetrics } from "../../utils/chat";
 import { mapOptional, principalBytesToString } from "../../utils/mapping";
-import { accessGate, groupSubtype, messageEvent } from "./chatMappersV2";
+import { accessGateConfig, groupSubtype, messageEvent } from "./chatMappersV2";
 import {
     nullMembership,
     type GroupChatSummary,
@@ -59,7 +59,10 @@ export function publicGroupSummary(
         frozen: value.frozen !== undefined,
         dateLastPinned: undefined,
         dateReadPinned: undefined,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            gate: { kind: "no_gate" },
+            expiry: undefined,
+        },
         level: "group",
         membership: nullMembership(),
         localUserIndex: principalBytesToString(value.local_user_index_canister_id),
diff --git a/frontend/openchat-agent/src/services/community/community.client.ts b/frontend/openchat-agent/src/services/community/community.client.ts
index 47fc14d6f7..099bd3922d 100644
--- a/frontend/openchat-agent/src/services/community/community.client.ts
+++ b/frontend/openchat-agent/src/services/community/community.client.ts
@@ -71,9 +71,9 @@ import {
     unpinMessageResponse,
     updateGroupResponse,
     videoCallParticipantsResponse,
+    apiMaybeAccessGateConfig,
 } from "../common/chatMappersV2";
 import type {
-    AccessGate,
     AddMembersToChannelResponse,
     BlockCommunityUserResponse,
     CandidateChannel,
@@ -139,6 +139,7 @@ import type {
     VideoCallPresence,
     SetVideoCallPresenceResponse,
     VideoCallParticipantsResponse,
+    AccessGateConfig,
 } from "openchat-shared";
 import {
     textToCode,
@@ -421,7 +422,8 @@ export class CommunityClient extends CandidService {
                 }),
                 permissions_v2: apiGroupPermissions(channel.permissions),
                 rules: channel.rules,
-                gate: apiMaybeAccessGate(channel.gate),
+                gate_config: apiMaybeAccessGateConfig(channel.gateConfig),
+                gate: apiMaybeAccessGate(channel.gateConfig.gate),
                 messages_visible_to_non_members: channel.messagesVisibleToNonMembers,
             },
             (resp) => createGroupResponse(resp, channel.id),
@@ -1397,7 +1399,7 @@ export class CommunityClient extends CandidService {
         permissions?: OptionalChatPermissions,
         avatar?: Uint8Array,
         eventsTimeToLiveMs?: OptionUpdate<bigint>,
-        gate?: AccessGate,
+        gateConfig?: AccessGateConfig,
         isPublic?: boolean,
         messagesVisibleToNonMembers?: boolean,
         externalUrl?: string,
@@ -1414,21 +1416,18 @@ export class CommunityClient extends CandidService {
                 public: isPublic,
                 events_ttl: apiOptionUpdateV2(identity, eventsTimeToLiveMs),
                 gate:
-                    gate === undefined
+                    gateConfig === undefined
                         ? "NoChange"
-                        : gate.kind === "no_gate"
+                        : gateConfig.gate.kind === "no_gate"
                           ? "SetToNone"
-                          : { SetToSome: apiAccessGate(gate) },
+                          : { SetToSome: apiAccessGate(gateConfig.gate) },
                 gate_config:
-                    gate === undefined
+                    gateConfig === undefined
                         ? "NoChange"
-                        : gate.kind === "no_gate"
+                        : gateConfig.gate.kind === "no_gate"
                           ? "SetToNone"
                           : {
-                                SetToSome: apiAccessGateConfig({
-                                    gate,
-                                    expiry: undefined,
-                                }),
+                                SetToSome: apiAccessGateConfig(gateConfig),
                             },
                 avatar:
                     avatar === undefined
@@ -1455,7 +1454,7 @@ export class CommunityClient extends CandidService {
         permissions?: Partial<CommunityPermissions>,
         avatar?: Uint8Array,
         banner?: Uint8Array,
-        gate?: AccessGate,
+        gateConfig?: AccessGateConfig,
         isPublic?: boolean,
         primaryLanguage?: string,
     ): Promise<UpdateCommunityResponse> {
@@ -1469,21 +1468,18 @@ export class CommunityClient extends CandidService {
                 public: isPublic,
                 primary_language: primaryLanguage,
                 gate:
-                    gate === undefined
+                    gateConfig === undefined
                         ? "NoChange"
-                        : gate.kind === "no_gate"
+                        : gateConfig.gate.kind === "no_gate"
                           ? "SetToNone"
-                          : { SetToSome: apiAccessGate(gate) },
+                          : { SetToSome: apiAccessGate(gateConfig.gate) },
                 gate_config:
-                    gate === undefined
+                    gateConfig === undefined
                         ? "NoChange"
-                        : gate.kind === "no_gate"
+                        : gateConfig.gate.kind === "no_gate"
                           ? "SetToNone"
                           : {
-                                SetToSome: apiAccessGateConfig({
-                                    gate,
-                                    expiry: undefined,
-                                }),
+                                SetToSome: apiAccessGateConfig(gateConfig),
                             },
                 avatar:
                     avatar === undefined
diff --git a/frontend/openchat-agent/src/services/community/mappersV2.ts b/frontend/openchat-agent/src/services/community/mappersV2.ts
index be6730a52a..1b4e703a83 100644
--- a/frontend/openchat-agent/src/services/community/mappersV2.ts
+++ b/frontend/openchat-agent/src/services/community/mappersV2.ts
@@ -69,7 +69,7 @@ import type {
 } from "../../typebox";
 import { mapOptional, optionUpdateV2, principalBytesToString } from "../../utils/mapping";
 import {
-    accessGate,
+    accessGateConfig,
     apiCommunityPermissionRole,
     chatMetrics,
     communityChannelSummary,
@@ -259,7 +259,10 @@ export function exploreChannelsResponse(
 export function channelMatch(value: TChannelMatch, communityId: string): ChannelMatch {
     return {
         id: { kind: "channel", communityId, channelId: value.id.toString() },
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            expiry: undefined,
+            gate: { kind: "no_gate" },
+        },
         name: value.name,
         description: value.description,
         memberCount: value.member_count,
@@ -337,7 +340,7 @@ export function communitySummaryUpdates(
         permissions: mapOptional(value.permissions, communityPermissions),
         channelsUpdated: value.channels_updated.map((c) => communityChannelUpdates(c, communityId)),
         metrics: mapOptional(value.metrics, chatMetrics),
-        gate: optionUpdateV2(value.gate, accessGate),
+        gateConfig: optionUpdateV2(value.gate_config, accessGateConfig),
         name: value.name,
         description: value.description,
         lastUpdated: value.last_updated,
@@ -366,6 +369,7 @@ export function communityMembershipUpdates(
         role: mapOptional(value.role, memberRole),
         displayName: optionUpdateV2(value.display_name, identity),
         rulesAccepted: value.rules_accepted,
+        lapsed: value.lapsed,
     };
 }
 
@@ -380,7 +384,7 @@ export function communityChannelUpdates(
         metrics: mapOptional(value.metrics, chatMetrics),
         subtype: optionUpdateV2(value.subtype, groupSubtype),
         dateLastPinned: value.date_last_pinned,
-        gate: optionUpdateV2(value.gate, accessGate),
+        gateConfig: optionUpdateV2(value.gate_config, accessGateConfig),
         name: value.name,
         description: value.description,
         externalUrl: optionUpdateV2(value.external_url, identity),
@@ -401,7 +405,7 @@ export function communityChannelUpdates(
 
 export function groupMembershipUpdates(value: TGroupMembershipUpdates): GroupMembershipUpdates {
     return {
-        role: mapOptional(value.role, memberRole),
+        myRole: mapOptional(value.role, memberRole),
         notificationsMuted: value.notifications_muted,
         latestThreads: value.latest_threads.map(threadSyncDetails),
         unfollowedThreads: Array.from(value.unfollowed_threads),
@@ -410,6 +414,7 @@ export function groupMembershipUpdates(value: TGroupMembershipUpdates): GroupMem
             .map(mention),
         myMetrics: mapOptional(value.my_metrics, chatMetrics),
         rulesAccepted: value.rules_accepted,
+        lapsed: value.lapsed,
     };
 }
 
@@ -487,15 +492,21 @@ export function communityDetailsResponse(
 ): CommunityDetailsResponse {
     if (typeof value === "object" && "Success" in value) {
         return {
-            members: value.Success.members.map((m) => ({
-                role: memberRole(m.role),
-                userId: principalBytesToString(m.user_id),
-                displayName: m.display_name,
-            })).concat(value.Success.basic_members.map((id) => ({
-                role: "member",
-                userId: principalBytesToString(id),
-                displayName: undefined
-            }))),
+            members: value.Success.members
+                .map((m) => ({
+                    role: memberRole(m.role),
+                    userId: principalBytesToString(m.user_id),
+                    displayName: m.display_name,
+                    lapsed: m.lapsed,
+                }))
+                .concat(
+                    value.Success.basic_members.map((id) => ({
+                        role: "member",
+                        userId: principalBytesToString(id),
+                        displayName: undefined,
+                        lapsed: false,
+                    })),
+                ),
             blockedUsers: new Set(value.Success.blocked_users.map(principalBytesToString)),
             invitedUsers: new Set(value.Success.invited_users.map(principalBytesToString)),
             rules: value.Success.chat_rules,
@@ -532,6 +543,7 @@ export function communityDetailsUpdatesResponse(
                     role: memberRole(m.role),
                     userId: principalBytesToString(m.user_id),
                     displayName: m.display_name,
+                    lapsed: m.lapsed,
                 })),
                 membersRemoved: new Set(value.Success.members_removed.map(principalBytesToString)),
                 blockedUsersAdded: new Set(
diff --git a/frontend/openchat-agent/src/services/group/group.client.ts b/frontend/openchat-agent/src/services/group/group.client.ts
index 77ee86bdc0..e7949b053b 100644
--- a/frontend/openchat-agent/src/services/group/group.client.ts
+++ b/frontend/openchat-agent/src/services/group/group.client.ts
@@ -34,7 +34,6 @@ import type {
     EventWrapper,
     OptionUpdate,
     ClaimPrizeResponse,
-    AccessGate,
     DeclineInvitationResponse,
     EventsSuccessResult,
     ChatEvent,
@@ -50,6 +49,7 @@ import type {
     SetVideoCallPresenceResponse,
     VideoCallPresence,
     VideoCallParticipantsResponse,
+    AccessGateConfig,
 } from "openchat-shared";
 import {
     DestinationInvalidError,
@@ -645,7 +645,7 @@ export class GroupClient extends CandidService {
         permissions?: OptionalChatPermissions,
         avatar?: Uint8Array,
         eventsTimeToLiveMs?: OptionUpdate<bigint>,
-        gate?: AccessGate,
+        gateConfig?: AccessGateConfig,
         isPublic?: boolean,
         messagesVisibleToNonMembers?: boolean,
     ): Promise<UpdateGroupResponse> {
@@ -669,23 +669,18 @@ export class GroupClient extends CandidService {
                 rules: mapOptional(rules, apiUpdatedRules),
                 events_ttl: apiOptionUpdateV2(identity, eventsTimeToLiveMs),
                 correlation_id: generateUint64(),
-                gate:
-                    gate === undefined
-                        ? "NoChange"
-                        : gate.kind === "no_gate"
-                        ? "SetToNone"
-                        : { SetToSome: apiAccessGate(gate) },
                 gate_config:
-                    gate === undefined
+                    gateConfig === undefined
                         ? "NoChange"
-                        : gate.kind === "no_gate"
-                        ? "SetToNone"
-                        : {
-                              SetToSome: apiAccessGateConfig({
-                                  gate,
-                                  expiry: undefined,
-                              }),
-                          },
+                        : gateConfig.gate.kind === "no_gate"
+                          ? "SetToNone"
+                          : { SetToSome: apiAccessGateConfig(gateConfig) },
+                gate:
+                    gateConfig === undefined
+                        ? "NoChange"
+                        : gateConfig.gate.kind === "no_gate"
+                          ? "SetToNone"
+                          : { SetToSome: apiAccessGate(gateConfig.gate) },
                 messages_visible_to_non_members: messagesVisibleToNonMembers,
             },
             updateGroupResponse,
diff --git a/frontend/openchat-agent/src/services/group/mappersV2.ts b/frontend/openchat-agent/src/services/group/mappersV2.ts
index e7658ce84f..013ebf7e9c 100644
--- a/frontend/openchat-agent/src/services/group/mappersV2.ts
+++ b/frontend/openchat-agent/src/services/group/mappersV2.ts
@@ -19,6 +19,7 @@ import type {
     OptionalGroupPermissions as TOptionalGroupPermissions,
     OptionalMessagePermissions as TOptionalMessagePermissions,
     UpdatedRules as TUpdatedRules,
+    GroupMembershipUpdates as TGroupMembershipUpdates,
 } from "../../typebox";
 import type {
     ChatEvent,
@@ -40,10 +41,11 @@ import type {
     FollowThreadResponse,
     OptionalChatPermissions,
     OptionalMessagePermissions,
+    GroupMembershipUpdates,
 } from "openchat-shared";
-import { CommonResponses, UnsupportedValueError } from "openchat-shared";
+import { CommonResponses, emptyChatMetrics, UnsupportedValueError } from "openchat-shared";
 import {
-    accessGate,
+    accessGateConfig,
     apiPermissionRole,
     chatMetrics,
     eventsSuccessResponse,
@@ -112,26 +114,41 @@ export function groupChatSummary(
         latestMessage: mapOptional(value.latest_message, messageEvent),
         latestEventIndex: value.latest_event_index,
         latestMessageIndex: value.latest_message_index,
-        joined: value.joined,
         memberCount: value.participant_count,
-        myRole: memberRole(value.role),
-        mentions: value.mentions
-            .filter((m) => m.thread_root_message_index !== undefined)
-            .map(mention),
         permissions: groupPermissions(value.permissions_v2),
-        notificationsMuted: value.notifications_muted,
         metrics: chatMetrics(value.metrics),
-        myMetrics: chatMetrics(value.my_metrics),
-        latestThreads: value.latest_threads.map(threadSyncDetails),
         frozen: value.frozen !== undefined,
         dateLastPinned: value.date_last_pinned,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
-        rulesAccepted: value.rules_accepted,
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            gate: { kind: "no_gate" },
+            expiry: undefined,
+        },
         eventsTTL: value.events_ttl,
         eventsTtlLastUpdated: value.events_ttl_last_updated,
         localUserIndex: principalBytesToString(value.local_user_index_canister_id),
         videoCallInProgress: mapOptional(value.video_call_in_progress, (v) => v.message_index),
         messagesVisibleToNonMembers: value.messages_visible_to_non_members,
+        membership: mapOptional(value.membership, (m) => ({
+            joined: m.joined,
+            role: memberRole(m.role),
+            notificationsMuted: m.notifications_muted,
+            lapsed: m.lapsed,
+            rulesAccepted: m.rules_accepted,
+            latestThreads: m.latest_threads.map(threadSyncDetails),
+            mentions: m.mentions
+                .filter((m) => m.thread_root_message_index !== undefined)
+                .map(mention),
+            myMetrics: chatMetrics(m.my_metrics),
+        })) ?? {
+            joined: 0n,
+            role: "none",
+            mentions: [],
+            latestThreads: [],
+            myMetrics: emptyChatMetrics(),
+            notificationsMuted: false,
+            rulesAccepted: false,
+            lapsed: false,
+        },
     };
 }
 
@@ -153,6 +170,21 @@ export function summaryUpdatesResponse(
     );
 }
 
+export function groupMembershipUpdates(value: TGroupMembershipUpdates): GroupMembershipUpdates {
+    return {
+        myRole: mapOptional(value.role, memberRole),
+        mentions: value.mentions
+            .filter((m) => m.thread_root_message_index === undefined)
+            .map(mention),
+        notificationsMuted: value.notifications_muted,
+        myMetrics: mapOptional(value.my_metrics, chatMetrics),
+        latestThreads: value.latest_threads.map(threadSyncDetails),
+        unfollowedThreads: Array.from(value.unfollowed_threads),
+        rulesAccepted: value.rules_accepted,
+        lapsed: value.lapsed,
+    };
+}
+
 export function groupChatSummaryUpdates(
     value: TGroupCanisterGroupChatSummaryUpdates,
 ): GroupCanisterGroupChatSummaryUpdates {
@@ -168,25 +200,17 @@ export function groupChatSummaryUpdates(
         latestEventIndex: value.latest_event_index,
         latestMessageIndex: value.latest_message_index,
         memberCount: value.participant_count,
-        myRole: mapOptional(value.role, memberRole),
-        mentions: value.mentions
-            .filter((m) => m.thread_root_message_index === undefined)
-            .map(mention),
         permissions: mapOptional(value.permissions_v2, groupPermissions),
-        notificationsMuted: value.notifications_muted,
         metrics: mapOptional(value.metrics, chatMetrics),
-        myMetrics: mapOptional(value.my_metrics, chatMetrics),
-        latestThreads: value.latest_threads.map(threadSyncDetails),
-        unfollowedThreads: Array.from(value.unfollowed_threads),
         frozen: optionUpdateV2(value.frozen, (_) => true),
         updatedEvents: value.updated_events.map(updatedEvent),
         dateLastPinned: value.date_last_pinned,
-        gate: optionUpdateV2(value.gate, accessGate),
-        rulesAccepted: value.rules_accepted,
+        gateConfig: optionUpdateV2(value.gate_config, accessGateConfig),
         eventsTTL: optionUpdateV2(value.events_ttl, identity),
         eventsTtlLastUpdated: value.events_ttl_last_updated,
         videoCallInProgress: optionUpdateV2(value.video_call_in_progress, (v) => v.message_index),
         messagesVisibleToNonMembers: value.messages_visible_to_non_members,
+        membership: mapOptional(value.membership, groupMembershipUpdates),
     };
 }
 
@@ -356,6 +380,9 @@ export function sendMessageResponse(value: GroupSendMessageResponse): SendMessag
     if (value === "RulesNotAccepted") {
         return { kind: "rules_not_accepted" };
     }
+    if (value === "UserLapsed") {
+        return { kind: "user_lapsed" };
+    }
 
     throw new UnsupportedValueError("Unexpected ApiSendMessageResponse type received", value);
 }
diff --git a/frontend/openchat-agent/src/services/groupIndex/mappers.ts b/frontend/openchat-agent/src/services/groupIndex/mappers.ts
index 0840fe9d04..21c477abb3 100644
--- a/frontend/openchat-agent/src/services/groupIndex/mappers.ts
+++ b/frontend/openchat-agent/src/services/groupIndex/mappers.ts
@@ -17,7 +17,7 @@ import type {
 } from "openchat-shared";
 import { UnsupportedValueError } from "openchat-shared";
 import { publicGroupSummary } from "../common/publicSummaryMapperV2";
-import { accessGate, groupSubtype } from "../common/chatMappersV2";
+import { accessGateConfig, groupSubtype } from "../common/chatMappersV2";
 import type {
     CommunityMatch as TCommunityMatch,
     GroupIndexActiveGroupsResponse,
@@ -322,7 +322,10 @@ function communityMatch(value: TCommunityMatch): CommunityMatch {
         },
         memberCount: value.member_count,
         channelCount: value.channel_count,
-        gate: mapOptional(value.gate, accessGate) ?? { kind: "no_gate" },
+        gateConfig: mapOptional(value.gate_config, accessGateConfig) ?? {
+            expiry: undefined,
+            gate: { kind: "no_gate" },
+        },
         flags: value.moderation_flags,
         primaryLanguage: value.primary_language === "" ? "en" : value.primary_language,
     };
diff --git a/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts b/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
index cfb17073ad..107008db3d 100644
--- a/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
+++ b/frontend/openchat-agent/src/services/localUserIndex/localUserIndex.client.ts
@@ -302,7 +302,10 @@ export class LocalUserIndexClient extends CandidService {
                 verified_credential_args: mapOptional(credentialArgs, apiVerifiedCredentialArgs),
                 referred_by: mapOptional(referredBy, principalStringToBytes),
             },
-            (resp) => joinChannelResponse(resp, id.communityId),
+            (resp) => {
+                console.log("Join channel response: ", resp);
+                return joinChannelResponse(resp, id.communityId);
+            },
             LocalUserIndexJoinChannelArgs,
             LocalUserIndexJoinChannelResponse,
         );
diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
index f9e316cdb0..6068b91fca 100644
--- a/frontend/openchat-agent/src/services/openchatAgent.ts
+++ b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -147,7 +147,6 @@ import type {
     ProposalVoteDetails,
     SetMessageReminderResponse,
     DeclineInvitationResponse,
-    AccessGate,
     JoinCommunityResponse,
     GroupSearchResponse,
     ChatIdentifier,
@@ -214,6 +213,7 @@ import type {
     ExternalAchievement,
     ExternalAchievementsSuccess,
     ChitLeaderboardResponse,
+    AccessGateConfig,
     Verification,
 } from "openchat-shared";
 import {
@@ -763,7 +763,7 @@ export class OpenChatAgent extends EventTarget {
         permissions?: OptionalChatPermissions,
         avatar?: Uint8Array,
         eventsTimeToLive?: OptionUpdate<bigint>,
-        gate?: AccessGate,
+        gateConfig?: AccessGateConfig,
         isPublic?: boolean,
         messagesVisibleToNonMembers?: boolean,
         externalUrl?: string,
@@ -779,7 +779,7 @@ export class OpenChatAgent extends EventTarget {
                     permissions,
                     avatar,
                     eventsTimeToLive,
-                    gate,
+                    gateConfig,
                     isPublic,
                     messagesVisibleToNonMembers,
                 );
@@ -792,7 +792,7 @@ export class OpenChatAgent extends EventTarget {
                     permissions,
                     avatar,
                     eventsTimeToLive,
-                    gate,
+                    gateConfig,
                     isPublic,
                     messagesVisibleToNonMembers,
                     externalUrl,
diff --git a/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts b/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts
index 7b93803efc..faf2158a8a 100644
--- a/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/proposalsBot/candid/types.d.ts
@@ -819,6 +819,7 @@ export interface GroupInviteCodeChanged {
 }
 export interface GroupMatch {
   'id' : ChatId,
+  'gate_config' : [] | [AccessGateConfig],
   'subtype' : [] | [GroupSubtype],
   'gate' : [] | [AccessGate],
   'name' : string,
diff --git a/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts b/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts
index f3455a6216..8b7b90dba5 100644
--- a/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/storageBucket/candid/types.d.ts
@@ -849,6 +849,7 @@ export interface GroupInviteCodeChanged {
 }
 export interface GroupMatch {
   'id' : ChatId,
+  'gate_config' : [] | [AccessGateConfig],
   'subtype' : [] | [GroupSubtype],
   'gate' : [] | [AccessGate],
   'name' : string,
diff --git a/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts b/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts
index 44a49c82b4..581160962c 100644
--- a/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/storageIndex/candid/types.d.ts
@@ -849,6 +849,7 @@ export interface GroupInviteCodeChanged {
 }
 export interface GroupMatch {
   'id' : ChatId,
+  'gate_config' : [] | [AccessGateConfig],
   'subtype' : [] | [GroupSubtype],
   'gate' : [] | [AccessGate],
   'name' : string,
diff --git a/frontend/openchat-agent/src/services/translations/candid/types.d.ts b/frontend/openchat-agent/src/services/translations/candid/types.d.ts
index 04a6a9aa9b..49ac0ee72a 100644
--- a/frontend/openchat-agent/src/services/translations/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/translations/candid/types.d.ts
@@ -831,6 +831,7 @@ export interface GroupInviteCodeChanged {
 }
 export interface GroupMatch {
   'id' : ChatId,
+  'gate_config' : [] | [AccessGateConfig],
   'subtype' : [] | [GroupSubtype],
   'gate' : [] | [AccessGate],
   'name' : string,
diff --git a/frontend/openchat-agent/src/services/user/candid/types.d.ts b/frontend/openchat-agent/src/services/user/candid/types.d.ts
index f911a82cbe..1ba4d0de8f 100644
--- a/frontend/openchat-agent/src/services/user/candid/types.d.ts
+++ b/frontend/openchat-agent/src/services/user/candid/types.d.ts
@@ -1135,6 +1135,7 @@ export interface GroupInviteCodeChanged {
 }
 export interface GroupMatch {
   'id' : ChatId,
+  'gate_config' : [] | [AccessGateConfig],
   'subtype' : [] | [GroupSubtype],
   'gate' : [] | [AccessGate],
   'name' : string,
diff --git a/frontend/openchat-agent/src/services/user/mappers.ts b/frontend/openchat-agent/src/services/user/mappers.ts
index 8f03a94244..b3af246443 100644
--- a/frontend/openchat-agent/src/services/user/mappers.ts
+++ b/frontend/openchat-agent/src/services/user/mappers.ts
@@ -1170,6 +1170,7 @@ function directChatSummary(candid: ApiDirectChatSummary): DirectChatSummary {
             readByMeUpTo: optional(candid.read_by_me_up_to, identity),
             archived: candid.archived,
             rulesAccepted: false,
+            lapsed: false,
         },
     };
 }
diff --git a/frontend/openchat-agent/src/services/user/user.client.ts b/frontend/openchat-agent/src/services/user/user.client.ts
index 4e5f2356c6..242b1514de 100644
--- a/frontend/openchat-agent/src/services/user/user.client.ts
+++ b/frontend/openchat-agent/src/services/user/user.client.ts
@@ -302,8 +302,8 @@ export class UserClient extends CandidService {
                 ),
                 permissions: [apiCommunityPermissions(community.permissions)],
                 rules,
-                gate: apiMaybeAccessGate(community.gate),
-                gate_config: apiMaybeAccessGateConfig(community.gate),
+                gate_config: apiMaybeAccessGateConfig(community.gateConfig),
+                gate: apiMaybeAccessGate(community.gateConfig.gate),
                 default_channels: defaultChannels,
                 default_channel_rules: [defaultChannelRules],
                 primary_language: community.primaryLanguage,
@@ -331,8 +331,8 @@ export class UserClient extends CandidService {
                 ),
                 permissions_v2: [apiGroupPermissions(group.permissions)],
                 rules: group.rules,
-                gate: apiMaybeAccessGate(group.gate),
-                gate_config: apiMaybeAccessGateConfig(group.gate),
+                gate: apiMaybeAccessGate(group.gateConfig.gate),
+                gate_config: apiMaybeAccessGateConfig(group.gateConfig),
                 events_ttl: apiOptional(identity, group.eventsTTL),
                 messages_visible_to_non_members: apiOptional(
                     identity,
diff --git a/frontend/openchat-agent/src/utils/caching.ts b/frontend/openchat-agent/src/utils/caching.ts
index 45cb417ca1..e56f73b62c 100644
--- a/frontend/openchat-agent/src/utils/caching.ts
+++ b/frontend/openchat-agent/src/utils/caching.ts
@@ -51,7 +51,7 @@ import type { CryptocurrencyContent } from "openchat-shared";
 import type { PrizeContent } from "openchat-shared";
 import type { P2PSwapContent } from "openchat-shared";
 
-const CACHE_VERSION = 116;
+const CACHE_VERSION = 117;
 const EARLIEST_SUPPORTED_MIGRATION = 115;
 const MAX_INDEX = 9999999999;
 
@@ -141,14 +141,13 @@ type MigrationFunction<T> = (
     transaction: IDBPTransaction<T, StoreNames<T>[], "versionchange">,
 ) => Promise<void>;
 
-// Leaving this here as an example - needs to be commented to keep the compiler happy
-// async function clearChatsStore(
-//     _db: IDBPDatabase<ChatSchema>,
-//     _principal: Principal,
-//     tx: IDBPTransaction<ChatSchema, StoreNames<ChatSchema>[], "versionchange">,
-// ) {
-//     await tx.objectStore("chats").clear();
-// }
+async function clearChatsStore(
+    _db: IDBPDatabase<ChatSchema>,
+    _principal: Principal,
+    tx: IDBPTransaction<ChatSchema, StoreNames<ChatSchema>[], "versionchange">,
+) {
+    await tx.objectStore("chats").clear();
+}
 
 async function clearGroupDetailsStore(
     _db: IDBPDatabase<ChatSchema>,
@@ -174,14 +173,24 @@ async function clearEverything(
     nuke(db);
 }
 
+async function clearChatAndGroups(
+    _db: IDBPDatabase<ChatSchema>,
+    _principal: Principal,
+    tx: IDBPTransaction<ChatSchema, StoreNames<ChatSchema>[], "versionchange">,
+) {
+    await clearChatsStore(_db, _principal, tx);
+    await clearGroupDetailsStore(_db, _principal, tx);
+}
+
 const migrations: Record<number, MigrationFunction<ChatSchema>> = {
     115: clearEverything,
     116: async (db, principal, transaction) => {
         await Promise.all([
             clearGroupDetailsStore(db, principal, transaction),
-            clearCommunityDetailsStore(db, principal, transaction)
-        ])
+            clearCommunityDetailsStore(db, principal, transaction),
+        ]);
     },
+    117: clearChatAndGroups,
 };
 
 async function migrate(
diff --git a/frontend/openchat-agent/src/utils/chat.ts b/frontend/openchat-agent/src/utils/chat.ts
index 6cd819ba7e..c333ba1815 100644
--- a/frontend/openchat-agent/src/utils/chat.ts
+++ b/frontend/openchat-agent/src/utils/chat.ts
@@ -192,6 +192,7 @@ export function mergeDirectChatUpdates(
                 myMetrics: u.myMetrics ?? c.membership.myMetrics,
                 archived: u.archived ?? c.membership.archived,
                 rulesAccepted: false,
+                lapsed: false,
             },
         };
     });
@@ -248,7 +249,10 @@ export function mergeGroupChatUpdates(
             blobReference: applyOptionUpdate(c.blobReference, blobReferenceUpdate),
             dateLastPinned: g?.dateLastPinned ?? c.dateLastPinned,
             dateReadPinned: u?.dateReadPinned ?? c.dateReadPinned,
-            gate: applyOptionUpdate(c.gate, g?.gate) ?? { kind: "no_gate" },
+            gateConfig: applyOptionUpdate(c.gateConfig, g?.gateConfig) ?? {
+                gate: { kind: "no_gate" },
+                expiry: undefined,
+            },
             level: "group",
             eventsTTL: applyOptionUpdate(c.eventsTTL, g?.eventsTTL),
             eventsTtlLastUpdated: bigIntMax(
@@ -260,22 +264,24 @@ export function mergeGroupChatUpdates(
                 mentions:
                     g === undefined
                         ? c.membership.mentions
-                        : [...g.mentions, ...c.membership.mentions],
-                role: g?.myRole ?? c.membership.role,
+                        : [...(g?.membership?.mentions ?? []), ...c.membership.mentions],
+                role: g?.membership?.myRole ?? c.membership.role,
                 latestThreads: mergeThreads(
                     c.membership.latestThreads,
-                    g?.latestThreads ?? [],
-                    g?.unfollowedThreads ?? [],
+                    g?.membership?.latestThreads ?? [],
+                    g?.membership?.unfollowedThreads ?? [],
                     u?.threadsRead ?? {},
                 ),
                 readByMeUpTo:
                     readByMeUpTo !== undefined && latestMessage !== undefined
                         ? Math.min(readByMeUpTo, latestMessage.event.messageIndex)
                         : readByMeUpTo,
-                notificationsMuted: g?.notificationsMuted ?? c.membership.notificationsMuted,
-                myMetrics: g?.myMetrics ?? c.membership.myMetrics,
+                notificationsMuted:
+                    g?.membership?.notificationsMuted ?? c.membership.notificationsMuted,
+                myMetrics: g?.membership?.myMetrics ?? c.membership.myMetrics,
                 archived: u?.archived ?? c.membership.archived,
-                rulesAccepted: g?.rulesAccepted ?? c.membership.rulesAccepted,
+                rulesAccepted: g?.membership?.rulesAccepted ?? c.membership.rulesAccepted,
+                lapsed: g?.membership?.lapsed ?? c.membership.lapsed,
             },
             localUserIndex: c.localUserIndex,
             videoCallInProgress: applyOptionUpdate(c.videoCallInProgress, g?.videoCallInProgress),
@@ -320,20 +326,20 @@ export function mergeGroupChats(
                     : undefined,
             dateLastPinned: g.dateLastPinned,
             dateReadPinned: u?.dateReadPinned,
-            gate: g.gate,
+            gateConfig: g.gateConfig,
             level: "group",
             eventsTTL: g.eventsTTL,
             eventsTtlLastUpdated: g.eventsTtlLastUpdated,
             membership: {
-                joined: g.joined,
-                role: g.myRole,
-                mentions: g.mentions,
-                latestThreads: mergeThreads([], g.latestThreads, [], u?.threadsRead ?? {}),
-                myMetrics: g.myMetrics,
-                notificationsMuted: g.notificationsMuted,
+                ...g.membership,
+                latestThreads: mergeThreads(
+                    [],
+                    g.membership.latestThreads,
+                    [],
+                    u?.threadsRead ?? {},
+                ),
                 readByMeUpTo: u?.readByMeUpTo,
                 archived: u?.archived ?? false,
-                rulesAccepted: g.rulesAccepted,
             },
             localUserIndex: g.localUserIndex,
             videoCallInProgress: g.videoCallInProgress,
diff --git a/frontend/openchat-agent/src/utils/community.ts b/frontend/openchat-agent/src/utils/community.ts
index a62bdacc1c..2d6562ffd5 100644
--- a/frontend/openchat-agent/src/utils/community.ts
+++ b/frontend/openchat-agent/src/utils/community.ts
@@ -128,13 +128,17 @@ export function mergeCommunityUpdates(
                     c?.membership?.displayName,
                 ),
                 rulesAccepted: c?.membership?.rulesAccepted ?? community.membership.rulesAccepted,
+                lapsed: c?.membership?.lapsed ?? community.membership.lapsed,
             },
             channels: mergeChannelUpdates(
                 currentChannels,
                 u?.channels ?? [],
                 c?.channelsUpdated ?? [],
             ),
-            gate: applyOptionUpdate(community.gate, c?.gate) ?? { kind: "no_gate" },
+            gateConfig: applyOptionUpdate(community.gateConfig, c?.gateConfig) ?? {
+                gate: { kind: "no_gate" },
+                expiry: undefined,
+            },
             level: "community",
             public: c?.public ?? community.public,
             frozen: applyOptionUpdate(community.frozen, c?.frozen) ?? false,
@@ -208,7 +212,10 @@ function mergeChannelUpdates(
             blobReference: applyOptionUpdate(channel.blobReference, blobReferenceUpdate),
             dateLastPinned: c?.dateLastPinned ?? channel.dateLastPinned,
             dateReadPinned: u?.dateReadPinned ?? channel.dateReadPinned,
-            gate: applyOptionUpdate(channel.gate, c?.gate) ?? { kind: "no_gate" },
+            gateConfig: applyOptionUpdate(channel.gateConfig, c?.gateConfig) ?? {
+                gate: { kind: "no_gate" },
+                expiry: undefined,
+            },
             level: "channel",
             eventsTTL: applyOptionUpdate(channel.eventsTTL, c?.eventsTTL),
             eventsTtlLastUpdated: bigIntMax(
@@ -225,7 +232,7 @@ function mergeChannelUpdates(
                     c === undefined
                         ? channel.membership.mentions
                         : [...(c.membership?.mentions ?? []), ...channel.membership.mentions],
-                role: c?.membership?.role ?? channel.membership.role,
+                role: c?.membership?.myRole ?? channel.membership.role,
                 latestThreads: mergeThreads(
                     channel.membership.latestThreads,
                     c?.membership?.latestThreads ?? [],
@@ -241,6 +248,7 @@ function mergeChannelUpdates(
                 myMetrics: c?.membership?.myMetrics ?? channel.membership.myMetrics,
                 archived: u?.archived ?? channel.membership.archived,
                 rulesAccepted: c?.membership?.rulesAccepted ?? channel.membership.rulesAccepted,
+                lapsed: c?.membership?.lapsed ?? channel.membership.lapsed,
             },
             isInvited: false,
             messagesVisibleToNonMembers:
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index e033e9f908..805f7526c2 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -21,6 +21,7 @@ import {
     canCreatePublicChannel,
     canCreatePrivateChannel,
     canManageUserGroups,
+    isCommunityLapsed,
 } from "./utils/community";
 import {
     buildUserAvatarUrl,
@@ -74,6 +75,7 @@ import {
     doesMessageFailFilter,
     canStartVideoCalls,
     buildBlobUrl,
+    isLapsed,
 } from "./utils/chat";
 import {
     buildUsernameList,
@@ -142,6 +144,7 @@ import {
     selectedMessageContext,
     currentChatMembersMap,
     hideMessagesFromDirectBlocked,
+    currentChatLapsedMembers,
 } from "./stores/chat";
 import {
     cryptoBalance,
@@ -415,7 +418,6 @@ import type {
     ChitEventsResponse,
     GenerateChallengeResponse,
     ChallengeAttempt,
-    AccessGateWithLevel,
     PreprocessedGate,
     SubmitProofOfUniquePersonhoodResponse,
     Achievement,
@@ -426,7 +428,11 @@ import type {
     AirdropChannelDetails,
     ChitLeaderboardResponse,
     AuthenticationPrincipal,
+    AccessGateConfig,
     Verification,
+    EnhancedAccessGate,
+    PaymentGateApproval,
+    PaymentGateApprovals,
 } from "openchat-shared";
 import {
     AuthProvider,
@@ -495,6 +501,7 @@ import {
     communityStateStore,
     currentCommunityBlockedUsers,
     currentCommunityInvitedUsers,
+    currentCommunityLapsedMembers,
     currentCommunityMembers,
     currentCommunityReferrals,
     currentCommunityRules,
@@ -1407,45 +1414,44 @@ export class OpenChat extends OpenChatAgentWorker {
         );
     }
 
-    async approveAccessGatePayment(
-        group: MultiUserChat | CommunitySummary,
+    async approveAccessGatePayments(
+        entity: MultiUserChat | CommunitySummary,
+        approvals: PaymentGateApprovals,
     ): Promise<ApproveAccessGatePaymentResponse> {
-        // If there is no payment gate then do nothing
-        if (!isPaymentGate(group.gate)) {
-            // If this is a channel there might still be a payment gate on the community
-            if (group.kind === "channel") {
-                return this.approveAccessGatePayment(
-                    this._liveState.communities.get({
-                        kind: "community",
-                        communityId: group.id.communityId,
-                    })!,
-                );
-            } else {
-                return CommonResponses.success();
-            }
+        if (approvals.size === 0) return CommonResponses.success();
+
+        let pin: string | undefined = undefined;
+        if (this._liveState.pinNumberRequired) {
+            pin = await this.promptForCurrentPin("pinNumber.enterPinInfo");
         }
 
-        // If there is a payment gateway then first call the user's canister to get an
-        // approval for the group/community to transfer the payment
-        const spender = group.kind === "group_chat" ? group.id.groupId : group.id.communityId;
+        const spender = entity.kind === "group_chat" ? entity.id.groupId : entity.id.communityId;
 
-        const token = this.getTokenDetailsForAccessGate(group.gate);
+        const results = await Promise.all(
+            [...approvals.entries()].map(([ledger, approval]) =>
+                this.approveAccessGatePayment(spender, ledger, approval, pin),
+            ),
+        );
 
-        if (token === undefined) {
-            return CommonResponses.failure();
+        if (results.every((r) => r.kind === "success")) {
+            return CommonResponses.success();
         }
 
-        let pin: string | undefined = undefined;
-
-        if (this._liveState.pinNumberRequired) {
-            pin = await this.promptForCurrentPin("pinNumber.enterPinInfo");
-        }
+        // TODO - this might be a bit shit
+        return results[0];
+    }
 
+    async approveAccessGatePayment(
+        spender: string,
+        ledger: string,
+        { amount, approvalFee }: PaymentGateApproval,
+        pin: string | undefined,
+    ): Promise<ApproveAccessGatePaymentResponse> {
         return this.sendRequest({
             kind: "approveTransfer",
             spender,
-            ledger: group.gate.ledgerCanister,
-            amount: group.gate.amount - token.transferFee, // The user should pay only the amount not amount+fee so it is a round number
+            ledger,
+            amount: amount - approvalFee, // The user should pay only the amount not amount+fee so it is a round number
             expiresIn: BigInt(5 * 60 * 1000), // Allow 5 mins for the join_group call before the approval expires
             pin,
         })
@@ -1466,8 +1472,12 @@ export class OpenChat extends OpenChatAgentWorker {
             .catch(() => CommonResponses.failure());
     }
 
-    async joinGroup(chat: MultiUserChat, credentials: string[]): Promise<ClientJoinGroupResponse> {
-        const approveResponse = await this.approveAccessGatePayment(chat);
+    async joinGroup(
+        chat: MultiUserChat,
+        credentials: string[],
+        paymentApprovals: PaymentGateApprovals,
+    ): Promise<ClientJoinGroupResponse> {
+        const approveResponse = await this.approveAccessGatePayments(chat, paymentApprovals);
         if (approveResponse.kind !== "success") {
             return approveResponse;
         }
@@ -1923,6 +1933,23 @@ export class OpenChat extends OpenChatAgentWorker {
         return this.multiUserChatPredicate(chatId, isPreviewing);
     }
 
+    isLapsed(id: ChatIdentifier | CommunityIdentifier): boolean {
+        if (id.kind === "direct_chat") {
+            return false;
+        } else if (id.kind === "channel") {
+            return (
+                this.communityPredicate(
+                    { kind: "community", communityId: id.communityId },
+                    isCommunityLapsed,
+                ) || this.multiUserChatPredicate(id, isLapsed)
+            );
+        } else if (id.kind === "community") {
+            return this.communityPredicate(id, isCommunityLapsed);
+        } else {
+            return this.multiUserChatPredicate(id, isLapsed);
+        }
+    }
+
     isFrozen(chatId: ChatIdentifier): boolean {
         if (chatId.kind === "direct_chat") return false;
         return this.multiUserChatPredicate(chatId, isFrozen);
@@ -2424,6 +2451,7 @@ export class OpenChat extends OpenChatAgentWorker {
                     role: "member",
                     userId,
                     displayName: undefined,
+                    lapsed: false,
                 });
                 return new Map(ms);
                 return ms;
@@ -2451,6 +2479,7 @@ export class OpenChat extends OpenChatAgentWorker {
                     role: "member",
                     userId,
                     displayName: undefined,
+                    lapsed: false,
                 },
             ]);
         }
@@ -2776,9 +2805,15 @@ export class OpenChat extends OpenChatAgentWorker {
         return this.diffGroupPermissions(p1, p2) !== undefined;
     }
 
-    hasAccessGateChanged(current: AccessGate, original: AccessGate): boolean {
-        if (current === original) return false;
+    hasAccessGateChanged(
+        currentConfig: AccessGateConfig,
+        originalConfig: AccessGateConfig,
+    ): boolean {
+        if (currentConfig === originalConfig) return false;
+        const current = currentConfig.gate;
+        const original = originalConfig.gate;
         if (current.kind !== original.kind) return true;
+        if (currentConfig.expiry !== originalConfig.expiry) return true;
         if (isNeuronGate(current) && isNeuronGate(original)) {
             return (
                 current.governanceCanister !== original.governanceCanister ||
@@ -3033,12 +3068,18 @@ export class OpenChat extends OpenChatAgentWorker {
             communityLastUpdated: community.lastUpdated,
         }).catch(() => "failure");
         if (resp !== "failure") {
+            const [lapsed, members] = partition(resp.members, (m) => m.lapsed);
             communityStateStore.setProp(
                 community.id,
                 "members",
-                new Map(resp.members.map((m) => [m.userId, m])),
+                new Map(members.map((m) => [m.userId, m])),
             );
             communityStateStore.setProp(community.id, "blockedUsers", resp.blockedUsers);
+            communityStateStore.setProp(
+                community.id,
+                "lapsedMembers",
+                new Set(lapsed.map((m) => m.userId)),
+            );
             communityStateStore.setProp(community.id, "invitedUsers", resp.invitedUsers);
             communityStateStore.setProp(community.id, "rules", resp.rules);
             communityStateStore.setProp(community.id, "userGroups", resp.userGroups);
@@ -3056,7 +3097,10 @@ export class OpenChat extends OpenChatAgentWorker {
                 chatLastUpdated: serverChat.lastUpdated,
             }).catch(() => "failure");
             if (resp !== "failure") {
-                chatStateStore.setProp(serverChat.id, "members", resp.members);
+                const members = resp.members.filter((m) => !m.lapsed);
+                const lapsed = new Set(resp.members.filter((m) => m.lapsed).map((m) => m.userId));
+                chatStateStore.setProp(serverChat.id, "lapsedMembers", lapsed);
+                chatStateStore.setProp(serverChat.id, "members", members);
                 chatStateStore.setProp(
                     serverChat.id,
                     "membersMap",
@@ -4252,30 +4296,35 @@ export class OpenChat extends OpenChatAgentWorker {
     /**
      * When joining a channel it is possible that both the channel & the community
      * have access gates so we need to work out all applicable gates for the chat
-     * Note that we only return gates if we are not already a member.
+     * Note that we only return gates if we are not already a member (or our membership is lapsed).
      * We may also optionally exclude gates for things we are invited to in some scenariose
      */
-    accessGatesForChat(
-        chat: MultiUserChat,
-        excludeInvited: boolean = false,
-    ): AccessGateWithLevel[] {
-        const gates: AccessGateWithLevel[] = [];
+    accessGatesForChat(chat: MultiUserChat, excludeInvited: boolean = false): EnhancedAccessGate[] {
+        const gates: EnhancedAccessGate[] = [];
         const community =
             chat.kind === "channel" ? this.getCommunityForChannel(chat.id) : undefined;
         if (
             community !== undefined &&
-            community.gate.kind !== "no_gate" &&
-            community.membership.role === "none" &&
+            community.gateConfig.gate.kind !== "no_gate" &&
+            (community.membership.role === "none" || community.membership.lapsed) &&
             (!community.isInvited || !excludeInvited)
         ) {
-            gates.push({ level: "community", ...community.gate });
+            gates.push({
+                level: "community",
+                expiry: community.gateConfig.expiry,
+                ...community.gateConfig.gate,
+            });
         }
         if (
-            chat.gate.kind !== "no_gate" &&
-            chat.membership.role === "none" &&
+            chat.gateConfig.gate.kind !== "no_gate" &&
+            (chat.membership.role === "none" || chat.membership.lapsed) &&
             (!chat.isInvited || !excludeInvited)
         ) {
-            gates.push({ level: chat.level, ...chat.gate });
+            gates.push({
+                level: chat.level,
+                expiry: chat.gateConfig.expiry,
+                ...chat.gateConfig.gate,
+            });
         }
         return gates;
     }
@@ -5253,7 +5302,7 @@ export class OpenChat extends OpenChatAgentWorker {
         permissions?: OptionalChatPermissions,
         avatar?: Uint8Array,
         eventsTimeToLive?: OptionUpdate<bigint>,
-        gate?: AccessGate,
+        gateConfig?: AccessGateConfig,
         isPublic?: boolean,
         messagesVisibleToNonMembers?: boolean,
         externalUrl?: string,
@@ -5267,7 +5316,7 @@ export class OpenChat extends OpenChatAgentWorker {
             permissions,
             avatar,
             eventsTimeToLive,
-            gate,
+            gateConfig,
             isPublic,
             messagesVisibleToNonMembers,
             externalUrl,
@@ -5279,7 +5328,7 @@ export class OpenChat extends OpenChatAgentWorker {
                         name,
                         description: desc,
                         permissions,
-                        gate,
+                        gateConfig: gateConfig,
                         eventsTTL: eventsTimeToLive,
                     });
 
@@ -5303,10 +5352,10 @@ export class OpenChat extends OpenChatAgentWorker {
     }
 
     maskChatMessages(chat: ChatSummary): boolean {
-        // notAMember && (private || !messagesVisibleToNonMembers)
+        // notANonLapsedMember && (private || !messagesVisibleToNonMembers)
         return (
             this.isMultiUserChat(chat) &&
-            chat.membership.role === "none" &&
+            (chat.membership.role === "none" || this.isLapsed(chat.id)) &&
             (!chat.public || !chat.messagesVisibleToNonMembers)
         );
     }
@@ -5621,9 +5670,10 @@ export class OpenChat extends OpenChatAgentWorker {
                 const updatedCommunity = chatsResponse.state.communities.find(
                     (c) => c.id.communityId === selectedCommunity.id.communityId,
                 );
+
                 if (
                     updatedCommunity !== undefined &&
-                    updatedCommunity.latestEventIndex > selectedCommunity.latestEventIndex
+                    updatedCommunity.lastUpdated > selectedCommunity.lastUpdated
                 ) {
                     this.loadCommunityDetails(updatedCommunity);
                 }
@@ -7108,8 +7158,9 @@ export class OpenChat extends OpenChatAgentWorker {
     async joinCommunity(
         community: CommunitySummary,
         credentials: string[],
+        paymentApprovals: PaymentGateApprovals,
     ): Promise<ClientJoinCommunityResponse> {
-        const approveResponse = await this.approveAccessGatePayment(community);
+        const approveResponse = await this.approveAccessGatePayments(community, paymentApprovals);
         if (approveResponse.kind !== "success") {
             return approveResponse;
         }
@@ -7258,7 +7309,7 @@ export class OpenChat extends OpenChatAgentWorker {
         permissions: CommunityPermissions | undefined,
         avatar: Uint8Array | undefined,
         banner: Uint8Array | undefined,
-        gate: AccessGate | undefined,
+        gateConfig: AccessGateConfig | undefined,
         isPublic: boolean | undefined,
         primaryLanguage: string | undefined,
     ): Promise<boolean> {
@@ -7271,7 +7322,7 @@ export class OpenChat extends OpenChatAgentWorker {
             permissions,
             avatar,
             banner,
-            gate,
+            gateConfig,
             isPublic,
             primaryLanguage,
         })
@@ -7701,6 +7752,7 @@ export class OpenChat extends OpenChatAgentWorker {
     currentChatMembers = currentChatMembers;
     currentChatMembersMap = currentChatMembersMap;
     currentChatBlockedUsers = currentChatBlockedUsers;
+    currentChatLapsedMembers = currentChatLapsedMembers;
     currentChatInvitedUsers = currentChatInvitedUsers;
     hideMessagesFromDirectBlocked = hideMessagesFromDirectBlocked;
     chatStateStore = chatStateStore;
@@ -7764,6 +7816,7 @@ export class OpenChat extends OpenChatAgentWorker {
     currentCommunityMembers = currentCommunityMembers;
     currentCommunityRules = currentCommunityRules;
     currentCommunityBlockedUsers = currentCommunityBlockedUsers;
+    currentCommunityLapsedMembers = currentCommunityLapsedMembers;
     currentCommunityReferrals = currentCommunityReferrals;
     currentCommunityInvitedUsers = currentCommunityInvitedUsers;
     currentCommunityUserGroups = currentCommunityUserGroups;
diff --git a/frontend/openchat-client/src/stores/chat.ts b/frontend/openchat-client/src/stores/chat.ts
index a409872376..2d01991856 100644
--- a/frontend/openchat-client/src/stores/chat.ts
+++ b/frontend/openchat-client/src/stores/chat.ts
@@ -81,6 +81,7 @@ export const selectedChatId = derived(selectedMessageContext, ($messageContext)
 export const chatStateStore = createChatSpecificObjectStore<ChatSpecificState>(
     selectedChatId,
     () => ({
+        lapsedMembers: new Set<string>(),
         members: [],
         membersMap: new Map(),
         blockedUsers: new Set<string>(),
@@ -148,6 +149,13 @@ export const currentChatMembersMap = createDerivedPropStore<ChatSpecificState, "
     () => new Map(),
 );
 
+export const currentChatLapsedMembers = createDerivedPropStore<ChatSpecificState, "lapsedMembers">(
+    chatStateStore,
+    "lapsedMembers",
+    () => new Set<string>(),
+    setsAreEqual,
+);
+
 export const currentChatBlockedUsers = createDerivedPropStore<ChatSpecificState, "blockedUsers">(
     chatStateStore,
     "blockedUsers",
diff --git a/frontend/openchat-client/src/stores/community.ts b/frontend/openchat-client/src/stores/community.ts
index 593ff66574..b721b97d7d 100644
--- a/frontend/openchat-client/src/stores/community.ts
+++ b/frontend/openchat-client/src/stores/community.ts
@@ -62,6 +62,7 @@ export const communityStateStore = createCommunitySpecificObjectStore<CommunityS
     () => ({
         members: new Map<string, Member>(),
         blockedUsers: new Set<string>(),
+        lapsedMembers: new Set<string>(),
         invitedUsers: new Set<string>(),
         referrals: new Set<string>(),
         userGroups: new Map<number, UserGroupDetails>(),
@@ -85,6 +86,11 @@ export const currentCommunityBlockedUsers = createDerivedPropStore<
     "blockedUsers"
 >(communityStateStore, "blockedUsers", () => new Set<string>(), setsAreEqual);
 
+export const currentCommunityLapsedMembers = createDerivedPropStore<
+    CommunitySpecificState,
+    "lapsedMembers"
+>(communityStateStore, "lapsedMembers", () => new Set<string>(), setsAreEqual);
+
 export const currentCommunityReferrals = createDerivedPropStore<
     CommunitySpecificState,
     "referrals"
diff --git a/frontend/openchat-client/src/stores/localChatSummaryUpdates.ts b/frontend/openchat-client/src/stores/localChatSummaryUpdates.ts
index 45f11dbb61..111dcc750e 100644
--- a/frontend/openchat-client/src/stores/localChatSummaryUpdates.ts
+++ b/frontend/openchat-client/src/stores/localChatSummaryUpdates.ts
@@ -16,7 +16,7 @@ class LocalChatSummaryUpdatesStore extends LocalUpdatesStore<
 
     markAdded(summary: ChatSummary): void {
         this.applyUpdate(summary.id, (_) => ({
-            added: summary,
+            added: { ...summary, membership: { ...summary.membership, lapsed: false } },
             removedAtTimestamp: undefined,
         }));
     }
diff --git a/frontend/openchat-client/src/utils/chat.spec.ts b/frontend/openchat-client/src/utils/chat.spec.ts
index c6f28697af..7a79abea36 100644
--- a/frontend/openchat-client/src/utils/chat.spec.ts
+++ b/frontend/openchat-client/src/utils/chat.spec.ts
@@ -58,11 +58,12 @@ const defaultGroupChat: GroupChatSummary = {
     frozen: false,
     dateLastPinned: undefined,
     dateReadPinned: undefined,
-    gate: { kind: "no_gate" },
+    gateConfig: { gate: { kind: "no_gate" }, expiry: undefined },
     level: "group",
     eventsTTL: undefined,
     eventsTtlLastUpdated: BigInt(0),
     membership: {
+        lapsed: false,
         archived: false,
         mentions: [],
         notificationsMuted: false,
diff --git a/frontend/openchat-client/src/utils/chat.ts b/frontend/openchat-client/src/utils/chat.ts
index 22cb84ebf8..a60c5852d9 100644
--- a/frontend/openchat-client/src/utils/chat.ts
+++ b/frontend/openchat-client/src/utils/chat.ts
@@ -89,6 +89,10 @@ export function isPreviewing(chat: ChatSummary): boolean {
     return chat.membership.role === "none";
 }
 
+export function isLapsed(chat: ChatSummary): boolean {
+    return chat.membership.lapsed;
+}
+
 export function isFrozen(thing: AccessControlled): boolean {
     return thing.frozen;
 }
@@ -362,7 +366,11 @@ export function mergeLocalSummaryUpdates(
     for (const [chatId, localUpdate] of localUpdates.entries()) {
         if (localUpdate.added !== undefined && scopeMatchesChat(scope, localUpdate.added)) {
             const current = merged.get(chatId);
-            if (current === undefined || (current.kind === "group_chat" && isPreviewing(current))) {
+            if (
+                current === undefined ||
+                isLapsed(current) ||
+                (current.kind === "group_chat" && isPreviewing(current))
+            ) {
                 merged.set(chatId, localUpdate.added);
             }
         }
@@ -396,6 +404,7 @@ export function mergeLocalSummaryUpdates(
                         },
                     });
                 } else if (current.kind === updated.kind) {
+                    const mergedGate = { ...current.gateConfig.gate, ...updated.gateConfig?.gate };
                     merged.set(chatId, {
                         ...current,
                         latestMessage,
@@ -405,9 +414,9 @@ export function mergeLocalSummaryUpdates(
                         description: updated.description ?? current.description,
                         public: updated.public ?? current.public,
                         permissions: mergePermissions(current.permissions, updated.permissions),
-                        gate: {
-                            ...current.gate,
-                            ...updated.gate,
+                        gateConfig: {
+                            gate: mergedGate,
+                            expiry: updated.gateConfig?.expiry ?? current.gateConfig.expiry,
                         },
                         membership: {
                             ...current.membership,
@@ -906,7 +915,7 @@ export function groupChatFromCandidate(
         frozen: false,
         dateLastPinned: undefined,
         dateReadPinned: undefined,
-        gate: candidate.gate,
+        gateConfig: candidate.gateConfig,
         level: "group",
         membership: {
             ...nullMembership(),
diff --git a/frontend/openchat-client/src/utils/community.ts b/frontend/openchat-client/src/utils/community.ts
index a4c1d09e6b..d279fd9aee 100644
--- a/frontend/openchat-client/src/utils/community.ts
+++ b/frontend/openchat-client/src/utils/community.ts
@@ -47,6 +47,10 @@ export function canChangeCommunityPermissions({ membership }: CommunitySummary):
     return hasOwnerRights(membership.role);
 }
 
+export function isCommunityLapsed({ membership }: CommunitySummary): boolean {
+    return membership.lapsed;
+}
+
 export function canDeleteCommunity({ membership }: CommunitySummary): boolean {
     return hasOwnerRights(membership.role);
 }
diff --git a/frontend/openchat-client/src/utils/time.ts b/frontend/openchat-client/src/utils/time.ts
index 3127dd1c71..71a455af53 100644
--- a/frontend/openchat-client/src/utils/time.ts
+++ b/frontend/openchat-client/src/utils/time.ts
@@ -8,6 +8,8 @@ type DurationData = {
     hours: number;
     minutes: number;
     seconds: number;
+    weeks: number;
+    months: number;
 };
 
 export function formatDisappearingMessageTime(
@@ -41,13 +43,17 @@ export function durationFromMilliseconds(total: number): DurationData {
     const seconds = Math.floor((total / 1000) % 60);
     const minutes = Math.floor((total / 1000 / 60) % 60);
     const hours = Math.floor((total / (1000 * 60 * 60)) % 24);
-    const days = Math.floor(total / (1000 * 60 * 60 * 24));
+    const days = Math.floor((total / (1000 * 60 * 60 * 24)) % 7);
+    const weeks = Math.floor((total / (1000 * 60 * 60 * 24 * 7)) % 4);
+    const months = Math.floor(total / (1000 * 60 * 60 * 24 * 7 * 4));
     return {
         total,
         days,
         hours,
         minutes,
         seconds,
+        weeks,
+        months,
     };
 }
 
@@ -73,7 +79,11 @@ export function formatDuration(ms: number): string {
     return result;
 }
 
-export function formatTimeRemaining(now: number, deadline: number, excludeDays: boolean = false): string {
+export function formatTimeRemaining(
+    now: number,
+    deadline: number,
+    excludeDays: boolean = false,
+): string {
     const { days, hours, minutes, seconds } = startsIn(now, deadline);
 
     let text = `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
diff --git a/frontend/openchat-shared/src/constants.ts b/frontend/openchat-shared/src/constants.ts
index 3b2b98498c..80862214f1 100644
--- a/frontend/openchat-shared/src/constants.ts
+++ b/frontend/openchat-shared/src/constants.ts
@@ -15,5 +15,7 @@ export const MIN_DOWNLINK = 0.05;
 export const ONE_MINUTE_MILLIS = 60 * 1000;
 export const ONE_HOUR = 60 * ONE_MINUTE_MILLIS;
 export const ONE_DAY = 24 * ONE_HOUR;
+export const ONE_WEEK = ONE_DAY * 7;
+export const ONE_MONTH = ONE_WEEK * 4;
 export const ONE_YEAR = 365 * ONE_DAY;
 export const LARGE_GROUP_THRESHOLD = 1000;
diff --git a/frontend/openchat-shared/src/domain/access.ts b/frontend/openchat-shared/src/domain/access.ts
index 01eb99d8b7..37722c89f6 100644
--- a/frontend/openchat-shared/src/domain/access.ts
+++ b/frontend/openchat-shared/src/domain/access.ts
@@ -1,6 +1,6 @@
 import type { Level } from "./structure";
 
-export type AccessGateWithLevel = { level: Level } & AccessGate;
+export type EnhancedAccessGate = { level: Level; expiry: bigint | undefined } & AccessGate;
 
 export type AccessGate = LeafGate | CompositeGate;
 
@@ -70,6 +70,10 @@ export type NeuronGate = {
     minDissolveDelay?: number;
 };
 
+export type PaymentGateApproval = { amount: bigint; approvalFee: bigint };
+
+export type PaymentGateApprovals = Map<string, PaymentGateApproval>;
+
 export type PaymentGate = {
     kind: "payment_gate";
     ledgerCanister: string;
@@ -154,7 +158,7 @@ export type LifetimeDiamondGate = { kind: "lifetime_diamond_gate" };
 export type UniquePersonGate = { kind: "unique_person_gate" };
 
 export type AccessControlled = {
-    gate: AccessGate;
+    gateConfig: AccessGateConfig;
     public: boolean;
     frozen: boolean;
     historyVisible: boolean;
@@ -191,4 +195,4 @@ If you break the rules you might be blocked and/or have your message(s) deleted.
     };
 }
 
-export type GateCheckSucceeded = { credentials: string[] };
+export type GateCheckSucceeded = { credentials: string[]; paymentApprovals: PaymentGateApprovals };
diff --git a/frontend/openchat-shared/src/domain/chat/chat.ts b/frontend/openchat-shared/src/domain/chat/chat.ts
index e858541257..77a8c508b7 100644
--- a/frontend/openchat-shared/src/domain/chat/chat.ts
+++ b/frontend/openchat-shared/src/domain/chat/chat.ts
@@ -2,7 +2,7 @@ import type DRange from "drange";
 import type { DataContent } from "../data/data";
 import type { Referral, UserSummary } from "../user/user";
 import type { OptionUpdate } from "../optionUpdate";
-import type { AccessGate, AccessControlled, VersionedRules, UpdatedRules } from "../access";
+import type { AccessControlled, VersionedRules, UpdatedRules, AccessGateConfig } from "../access";
 import type {
     ChatPermissionRole,
     ChatPermissions,
@@ -674,7 +674,7 @@ export type LocalChatSummaryUpdates = {
               public?: boolean;
               permissions?: OptionalChatPermissions;
               frozen?: boolean;
-              gate?: AccessGate;
+              gateConfig?: AccessGateConfig;
               notificationsMuted?: boolean;
               archived?: boolean;
               rulesAccepted?: boolean;
@@ -1302,6 +1302,7 @@ export type Member = {
     role: MemberRole;
     userId: string;
     displayName: string | undefined;
+    lapsed: boolean;
 };
 
 export type FullMember = Member & UserSummary;
@@ -1327,6 +1328,7 @@ export type GroupChatDetails = {
  * All properties are optional but individual derived stores can provide their own default values
  */
 export type ChatSpecificState = {
+    lapsedMembers: Set<string>;
     members: Member[];
     membersMap: Map<string, Member>;
     blockedUsers: Set<string>;
@@ -1433,6 +1435,7 @@ export function nullMembership(): ChatMembership {
         readByMeUpTo: undefined,
         archived: false,
         rulesAccepted: false,
+        lapsed: false,
     };
 }
 
@@ -1446,6 +1449,7 @@ export type ChatMembership = {
     readByMeUpTo: number | undefined;
     archived: boolean;
     rulesAccepted: boolean;
+    lapsed: boolean;
 };
 
 export type GroupCanisterSummaryResponse =
@@ -1471,23 +1475,28 @@ export type GroupCanisterGroupChatSummary = AccessControlled &
         latestMessage: EventWrapper<Message> | undefined;
         latestEventIndex: number;
         latestMessageIndex: number | undefined;
-        joined: bigint;
-        myRole: MemberRole;
         memberCount: number;
-        mentions: Mention[];
-        notificationsMuted: boolean;
         metrics: Metrics;
-        myMetrics: Metrics;
-        latestThreads: GroupCanisterThreadDetails[];
         dateLastPinned: bigint | undefined;
-        rulesAccepted: boolean;
         eventsTTL?: bigint;
         eventsTtlLastUpdated: bigint;
         localUserIndex: string;
         videoCallInProgress?: number;
         messagesVisibleToNonMembers: boolean;
+        membership: GroupCanisterGroupMembership;
     };
 
+export type GroupCanisterGroupMembership = {
+    role: ChatPermissionRole;
+    notificationsMuted: boolean;
+    lapsed: boolean;
+    joined: bigint;
+    rulesAccepted: boolean;
+    latestThreads: ThreadSyncDetails[];
+    mentions: Mention[];
+    myMetrics: Metrics;
+};
+
 export type UpdatedEvent = {
     eventIndex: number;
     threadRootMessageIndex?: number;
@@ -1506,23 +1515,28 @@ export type GroupCanisterGroupChatSummaryUpdates = {
     latestEventIndex: number | undefined;
     latestMessageIndex: number | undefined;
     memberCount: number | undefined;
-    myRole: MemberRole | undefined;
-    mentions: Mention[];
     permissions: ChatPermissions | undefined;
-    notificationsMuted: boolean | undefined;
     metrics: Metrics | undefined;
-    myMetrics: Metrics | undefined;
-    latestThreads: GroupCanisterThreadDetails[];
-    unfollowedThreads: number[];
     frozen: OptionUpdate<boolean>;
     updatedEvents: UpdatedEvent[];
     dateLastPinned: bigint | undefined;
-    gate: OptionUpdate<AccessGate>;
-    rulesAccepted: boolean | undefined;
+    gateConfig: OptionUpdate<AccessGateConfig>;
     eventsTTL: OptionUpdate<bigint>;
     eventsTtlLastUpdated?: bigint;
     videoCallInProgress: OptionUpdate<number>;
     messagesVisibleToNonMembers?: boolean;
+    membership: GroupMembershipUpdates | undefined;
+};
+
+export type GroupMembershipUpdates = {
+    myRole: MemberRole | undefined;
+    notificationsMuted: boolean | undefined;
+    lapsed: boolean | undefined;
+    unfollowedThreads: number[];
+    rulesAccepted: boolean | undefined;
+    latestThreads: GroupCanisterThreadDetails[];
+    mentions: Mention[];
+    myMetrics: Metrics | undefined;
 };
 
 export type GroupCanisterThreadDetails = {
diff --git a/frontend/openchat-shared/src/domain/community/index.ts b/frontend/openchat-shared/src/domain/community/index.ts
index 7aa57e359c..bf1a86d161 100644
--- a/frontend/openchat-shared/src/domain/community/index.ts
+++ b/frontend/openchat-shared/src/domain/community/index.ts
@@ -1,4 +1,4 @@
-import type { AccessControlled, AccessGate, VersionedRules } from "../access";
+import type { AccessControlled, AccessGateConfig, VersionedRules } from "../access";
 import type {
     GateCheckFailed,
     GateCheckFailedReason,
@@ -10,10 +10,9 @@ import type {
     ChannelIdentifier,
     GroupSubtype,
     EventWrapper,
-    GroupCanisterThreadDetails,
-    Mention,
     UpdatedEvent,
     CanisterNotFound,
+    GroupMembershipUpdates,
 } from "../chat";
 import type { DataContent } from "../data";
 import type { OptionUpdate } from "../optionUpdate";
@@ -51,6 +50,7 @@ export type CommunityMembership = {
     index: number;
     displayName: string | undefined;
     rulesAccepted: boolean;
+    lapsed: boolean;
 };
 
 export type CommunityIdentifier = {
@@ -89,6 +89,7 @@ export type CommunitySpecificState = {
     userGroups: Map<number, UserGroupDetails>;
     members: Map<string, Member>;
     blockedUsers: Set<string>;
+    lapsedMembers: Set<string>;
     invitedUsers: Set<string>;
     referrals: Set<string>;
     rules?: VersionedRules;
@@ -189,7 +190,7 @@ export type CommunityCanisterCommunitySummaryUpdates = {
     permissions: CommunityPermissions | undefined;
     channelsUpdated: CommunityCanisterChannelSummaryUpdates[];
     metrics: Metrics | undefined;
-    gate: OptionUpdate<AccessGate>;
+    gateConfig: OptionUpdate<AccessGateConfig>;
     name: string | undefined;
     description: string | undefined;
     lastUpdated: bigint;
@@ -213,7 +214,7 @@ export type CommunityCanisterChannelSummaryUpdates = {
     metrics: Metrics | undefined;
     subtype: OptionUpdate<GroupSubtype>;
     dateLastPinned: bigint | undefined;
-    gate: OptionUpdate<AccessGate>;
+    gateConfig: OptionUpdate<AccessGateConfig>;
     name: string | undefined;
     description: string | undefined;
     lastUpdated: bigint;
@@ -235,21 +236,12 @@ export type CommunityMembershipUpdates = {
     role: MemberRole | undefined;
     displayName: OptionUpdate<string>;
     rulesAccepted: boolean | undefined;
-};
-
-export type GroupMembershipUpdates = {
-    role: MemberRole | undefined;
-    notificationsMuted: boolean | undefined;
-    latestThreads: GroupCanisterThreadDetails[];
-    unfollowedThreads: number[];
-    mentions: Mention[];
-    myMetrics: Metrics | undefined;
-    rulesAccepted: boolean | undefined;
+    lapsed: boolean | undefined;
 };
 
 export type ChannelMatch = {
     id: ChannelIdentifier;
-    gate: AccessGate;
+    gateConfig: AccessGateConfig;
     name: string;
     description: string;
     avatar: DataContent;
diff --git a/frontend/openchat-shared/src/domain/permission.ts b/frontend/openchat-shared/src/domain/permission.ts
index 75cc87ae16..9407a01d69 100644
--- a/frontend/openchat-shared/src/domain/permission.ts
+++ b/frontend/openchat-shared/src/domain/permission.ts
@@ -36,6 +36,7 @@ export type Permissioned<T> = {
 export type HasMembershipRole = {
     membership: {
         role: MemberRole;
+        lapsed: boolean;
     };
 };
 
diff --git a/frontend/openchat-shared/src/domain/search/search.ts b/frontend/openchat-shared/src/domain/search/search.ts
index 8037f2d655..7eeac256bc 100644
--- a/frontend/openchat-shared/src/domain/search/search.ts
+++ b/frontend/openchat-shared/src/domain/search/search.ts
@@ -1,4 +1,4 @@
-import type { AccessGate } from "../access";
+import type { AccessGateConfig } from "../access";
 import type {
     ChatIdentifier,
     GroupChatIdentifier,
@@ -24,7 +24,7 @@ export interface CommunityMatch {
     banner: DataContent;
     memberCount: number;
     channelCount: number;
-    gate: AccessGate;
+    gateConfig: AccessGateConfig;
     flags: number;
     primaryLanguage: string;
 }
diff --git a/frontend/openchat-shared/src/domain/worker.ts b/frontend/openchat-shared/src/domain/worker.ts
index ef19a330b7..8f0ef605e8 100644
--- a/frontend/openchat-shared/src/domain/worker.ts
+++ b/frontend/openchat-shared/src/domain/worker.ts
@@ -123,7 +123,7 @@ import type {
     MemberRole,
     OptionalChatPermissions,
 } from "./permission";
-import type { AccessGate, Rules, UpdatedRules, VerifiedCredentialArgs } from "./access";
+import type { AccessGateConfig, Rules, UpdatedRules, VerifiedCredentialArgs } from "./access";
 import type {
     AddMembersToChannelResponse,
     BlockCommunityUserResponse,
@@ -921,7 +921,7 @@ type UpdateGroup = {
     permissions?: OptionalChatPermissions;
     avatar?: Uint8Array;
     eventsTimeToLive?: OptionUpdate<bigint>;
-    gate?: AccessGate;
+    gateConfig?: AccessGateConfig;
     isPublic?: boolean;
     kind: "updateGroup";
     messagesVisibleToNonMembers?: boolean;
@@ -1669,7 +1669,7 @@ type UpdateCommunity = {
     permissions?: Partial<CommunityPermissions>;
     avatar?: Uint8Array;
     banner?: Uint8Array;
-    gate?: AccessGate;
+    gateConfig?: AccessGateConfig;
     isPublic?: boolean;
     primaryLanguage?: string;
 };
diff --git a/frontend/openchat-worker/src/worker.ts b/frontend/openchat-worker/src/worker.ts
index 0d12434577..90b8d81e74 100644
--- a/frontend/openchat-worker/src/worker.ts
+++ b/frontend/openchat-worker/src/worker.ts
@@ -530,7 +530,7 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                         payload.permissions,
                         payload.avatar,
                         payload.eventsTimeToLive,
-                        payload.gate,
+                        payload.gateConfig,
                         payload.isPublic,
                         payload.messagesVisibleToNonMembers,
                         payload.externalUrl,
@@ -1259,7 +1259,7 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                             payload.permissions,
                             payload.avatar,
                             payload.banner,
-                            payload.gate,
+                            payload.gateConfig,
                             payload.isPublic,
                             payload.primaryLanguage,
                         ),