Merge branch 'master' into next

backend/canisters/user_index/CHANGELOG.md

@@ -6,18 +6,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
-### Added
-
-- Add `bot_config` to bot users ([#6220](https://github.com/open-chat-labs/open-chat/pull/6220))
-
 ### Changed
 
 - Replace `chit_balances` with `users_chit` which includes streak ([#6238](https://github.com/open-chat-labs/open-chat/pull/6238))
 
+## [[2.0.1291](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1291-user_index)] - 2024-08-14
+
+### Added
+
+- Add `bot_config` to bot users ([#6220](https://github.com/open-chat-labs/open-chat/pull/6220))
+
 ### Removed
 
 - Remove deprecated `is_bot` field from user records ([#6219](https://github.com/open-chat-labs/open-chat/pull/6219))
 
+### Fixed
+
+- Fix `is_deleted` check to only return true if userId hasn't been reused ([#6235](https://github.com/open-chat-labs/open-chat/pull/6235))
+
 ## [[2.0.1284](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1284-user_index)] - 2024-08-06
 
 ### Added

backend/canisters/user_index/impl/src/lifecycle/post_upgrade.rs

@@ -1,12 +1,11 @@
 use crate::lifecycle::{init_env, init_state};
 use crate::memory::get_upgrades_memory;
-use crate::{mutate_state, Data};
+use crate::Data;
 use canister_logger::LogEntry;
 use canister_tracing_macros::trace;
 use ic_cdk::post_upgrade;
 use stable_memory::get_reader;
 use tracing::info;
-use types::BotConfig;
 use user_index_canister::post_upgrade::Args;
 use utils::cycles::init_cycles_dispenser_client;
 
@@ -25,26 +24,4 @@ fn post_upgrade(args: Args) {
     init_state(env, data, args.wasm_version);
 
     info!(version = %args.wasm_version, "Post-upgrade complete");
-
-    mutate_state(|state| {
-        let now = state.env.now();
-        state.data.users.set_bot_config(
-            state.data.proposals_bot_canister_id.into(),
-            BotConfig {
-                is_oc_controlled: true,
-                supports_direct_messages: false,
-                can_be_added_to_groups: false,
-            },
-            now,
-        );
-        state.data.users.set_bot_config(
-            state.data.airdrop_bot_canister_id.into(),
-            BotConfig {
-                is_oc_controlled: true,
-                supports_direct_messages: true,
-                can_be_added_to_groups: false,
-            },
-            now,
-        );
-    });
 }

frontend/app/.ic-assets.json5

@@ -8,7 +8,7 @@
             "Strict-Transport-Security": "max-age=31536000; includeSubDomains",
             "X-Content-Type-Options": "nosniff",
             "X-XSS-Protection": "1; mode=block",
-            "Content-Security-Policy": "frame-ancestors https://4hy5z-qaaaa-aaaal-addrq-cai.icp0.io https://desktop.windoge98.com https://vault-bet.com https://www.vault-bet.com https://gooble.app  https://signalsicp.com https://kjfeq-waaaa-aaaan-qedva-cai.icp0.io https://spyzr-gqaaa-aaaan-qd66q-cai.icp0.io https://221bravo.app https://ht7v7-iaaaa-aaaak-qakga-cai.icp0.io https://mdocx-gyaaa-aaaak-qcbsq-cai.icp0.io https://calm-pasca-49d7be.netlify.app http://localhost:5173 https://zexzi-jyaaa-aaaam-abj3q-cai.icp0.io https://xw4dq-4yaaa-aaaam-abeuq-cai.ic0.app https://bxnm7-oqaaa-aaaag-albpq-cai.icp0.io https://panoramablock.com https://zdgud-kqaaa-aaaal-ajn4q-cai.icp0.io;",
+            "Content-Security-Policy": "frame-ancestors https://4hy5z-qaaaa-aaaal-addrq-cai.icp0.io https://desktop.windoge98.com https://vault-bet.com https://www.vault-bet.com https://gooble.app  https://signalsicp.com https://kjfeq-waaaa-aaaan-qedva-cai.icp0.io https://spyzr-gqaaa-aaaan-qd66q-cai.icp0.io https://221bravo.app https://ht7v7-iaaaa-aaaak-qakga-cai.icp0.io https://mdocx-gyaaa-aaaak-qcbsq-cai.icp0.io https://calm-pasca-49d7be.netlify.app http://localhost:5173 https://zexzi-jyaaa-aaaam-abj3q-cai.icp0.io https://xw4dq-4yaaa-aaaam-abeuq-cai.ic0.app https://bxnm7-oqaaa-aaaag-albpq-cai.icp0.io https://panoramablock.com https://zdgud-kqaaa-aaaal-ajn4q-cai.icp0.io https://okowr-oqaaa-aaaag-qkedq-cai.icp0.io;",
         },
         allow_raw_access: false,
     },

frontend/app/src/stores/xframe.ts

@@ -24,7 +24,8 @@ const FRAME_ANCESTORS = [
     "https://spyzr-gqaaa-aaaan-qd66q-cai.icp0.io", // vaultbet
     "https://bxnm7-oqaaa-aaaag-albpq-cai.icp0.io", // ZKP
     "https://panoramablock.com", // Panorama Block Live
-    "https://zdgud-kqaaa-aaaal-ajn4q-cai.icp0.io" // tendy zone test
+    "https://zdgud-kqaaa-aaaal-ajn4q-cai.icp0.io", // tendy zone test
+    "https://okowr-oqaaa-aaaag-qkedq-cai.icp0.io" // konecta pre-register
 ];
 
 type InboundXFrameMessage = UpdateTheme | ChangeRoute | OverrideSettings | Logout;