Merge remote-tracking branch 'origin/master' into hermes/hermes-1e775b03

# Conflicts:
#	server-rs/crates/api-server/src/app.rs
#	server-rs/crates/api-server/src/creation_entry_config.rs
#	server-rs/crates/api-server/src/puzzle.rs
#	server-rs/crates/spacetime-client/src/lib.rs
#	src/components/platform-entry/PlatformEntryFlowShellImpl.tsx

server-rs/crates/spacetime-client/src/mapper.rs

@@ -176,6 +176,18 @@ impl From<module_runtime::RuntimeProfileRechargeOrderCreateInput>
     }
 }
 
+impl From<module_runtime::RuntimeProfileRechargeOrderPaidInput>
+    for RuntimeProfileRechargeOrderPaidInput
+{
+    fn from(input: module_runtime::RuntimeProfileRechargeOrderPaidInput) -> Self {
+        Self {
+            order_id: input.order_id,
+            paid_at_micros: input.paid_at_micros,
+            provider_transaction_id: input.provider_transaction_id,
+        }
+    }
+}
+
 impl From<module_runtime::RuntimeProfileFeedbackSubmissionInput>
     for RuntimeProfileFeedbackSubmissionInput
 {
@@ -2253,6 +2265,7 @@ pub(crate) fn map_runtime_profile_recharge_order_snapshot(
         status: map_runtime_profile_recharge_order_status_back(snapshot.status),
         payment_channel: snapshot.payment_channel,
         paid_at_micros: snapshot.paid_at_micros,
+        provider_transaction_id: snapshot.provider_transaction_id,
         created_at_micros: snapshot.created_at_micros,
         points_delta: snapshot.points_delta,
         membership_expires_at_micros: snapshot.membership_expires_at_micros,
@@ -2953,6 +2966,9 @@ pub(crate) fn map_puzzle_draft_level(snapshot: DomainPuzzleDraftLevel) -> Puzzle
         level_name: snapshot.level_name,
         picture_description: snapshot.picture_description,
         picture_reference: snapshot.picture_reference,
+        ui_background_prompt: snapshot.ui_background_prompt,
+        ui_background_image_src: snapshot.ui_background_image_src,
+        ui_background_image_object_key: snapshot.ui_background_image_object_key,
         background_music: snapshot.background_music.map(map_puzzle_audio_asset),
         candidates: snapshot
             .candidates
@@ -3058,6 +3074,7 @@ fn map_match3d_creator_config(
         asset_style_id: snapshot.asset_style_id,
         asset_style_label: snapshot.asset_style_label,
         asset_style_prompt: snapshot.asset_style_prompt,
+        generate_click_sound: snapshot.generate_click_sound,
     }
 }
 
@@ -3835,6 +3852,8 @@ pub(crate) fn map_puzzle_runtime_level_snapshot(
         author_display_name: snapshot.author_display_name,
         theme_tags: snapshot.theme_tags,
         cover_image_src: snapshot.cover_image_src,
+        ui_background_image_src: snapshot.ui_background_image_src,
+        background_music: snapshot.background_music.map(map_puzzle_audio_asset),
         board: map_puzzle_board_snapshot(snapshot.board),
         status: snapshot.status.as_str().to_string(),
         started_at_ms,
@@ -5056,9 +5075,21 @@ pub(crate) fn map_runtime_profile_recharge_order_status_back(
     value: crate::module_bindings::RuntimeProfileRechargeOrderStatus,
 ) -> module_runtime::RuntimeProfileRechargeOrderStatus {
     match value {
+        crate::module_bindings::RuntimeProfileRechargeOrderStatus::Pending => {
+            module_runtime::RuntimeProfileRechargeOrderStatus::Pending
+        }
         crate::module_bindings::RuntimeProfileRechargeOrderStatus::Paid => {
             module_runtime::RuntimeProfileRechargeOrderStatus::Paid
         }
+        crate::module_bindings::RuntimeProfileRechargeOrderStatus::Failed => {
+            module_runtime::RuntimeProfileRechargeOrderStatus::Failed
+        }
+        crate::module_bindings::RuntimeProfileRechargeOrderStatus::Closed => {
+            module_runtime::RuntimeProfileRechargeOrderStatus::Closed
+        }
+        crate::module_bindings::RuntimeProfileRechargeOrderStatus::Refunded => {
+            module_runtime::RuntimeProfileRechargeOrderStatus::Refunded
+        }
     }
 }
 
@@ -5924,6 +5955,18 @@ pub struct PuzzleGeneratedImagesSaveRecordInput {
     pub saved_at_micros: i64,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PuzzleUiBackgroundSaveRecordInput {
+    pub session_id: String,
+    pub owner_user_id: String,
+    pub level_id: Option<String>,
+    pub levels_json: Option<String>,
+    pub prompt: String,
+    pub image_src: String,
+    pub image_object_key: Option<String>,
+    pub saved_at_micros: i64,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PuzzleSelectCoverImageRecordInput {
     pub session_id: String,
@@ -6146,6 +6189,7 @@ pub struct Match3DRunStartRecordInput {
     pub owner_user_id: String,
     pub profile_id: String,
     pub started_at_ms: i64,
+    pub item_type_count_override: u32,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -6204,6 +6248,7 @@ pub struct Match3DCreatorConfigRecord {
     pub asset_style_id: Option<String>,
     pub asset_style_label: Option<String>,
     pub asset_style_prompt: Option<String>,
+    pub generate_click_sound: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -6337,6 +6382,8 @@ struct Match3DCreatorConfigJsonRecord {
     asset_style_label: Option<String>,
     #[serde(default)]
     asset_style_prompt: Option<String>,
+    #[serde(default)]
+    generate_click_sound: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, serde::Deserialize)]
@@ -7321,6 +7368,9 @@ pub struct PuzzleDraftLevelRecord {
     pub level_name: String,
     pub picture_description: String,
     pub picture_reference: Option<String>,
+    pub ui_background_prompt: Option<String>,
+    pub ui_background_image_src: Option<String>,
+    pub ui_background_image_object_key: Option<String>,
     pub background_music: Option<PuzzleAudioAssetRecord>,
     pub candidates: Vec<PuzzleGeneratedImageCandidateRecord>,
     pub selected_candidate_id: Option<String>,
@@ -7495,6 +7545,8 @@ pub struct PuzzleRuntimeLevelRecord {
     pub author_display_name: String,
     pub theme_tags: Vec<String>,
     pub cover_image_src: Option<String>,
+    pub ui_background_image_src: Option<String>,
+    pub background_music: Option<PuzzleAudioAssetRecord>,
     pub board: PuzzleBoardRecord,
     pub status: String,
     pub started_at_ms: u64,