Merge branch 'main' into feat/custom-evm-networks-ui

Author: sbpublic

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.94.1"
+channel = "1.95.0"
 targets = ["wasm32-unknown-unknown"]

src/backend/src/utils/housekeeping.rs

@@ -129,7 +129,7 @@ pub(crate) fn start_periodic_housekeeping_timers() {
     set_timer(immediate, spawn_housekeeping_if_idle);
 
     // Then periodically:
-    let hour = Duration::from_secs(60 * 60);
+    let hour = Duration::from_hours(1);
     let _ = set_timer_interval(hour, spawn_housekeeping_if_idle);
 }
 

src/backend/tests/it/signer.rs

@@ -235,7 +235,7 @@ fn test_housekeeping_lock_resets_after_failed_topup() {
     // (no cycles ledger) and must release the guard so the next tick can
     // spawn a new one.
     for _ in 0..3 {
-        pic_setup.pic.advance_time(Duration::from_secs(60 * 60));
+        pic_setup.pic.advance_time(Duration::from_hours(1));
         for _ in 0..10 {
             pic_setup.pic.tick();
         }
@@ -294,7 +294,7 @@ fn test_housekeeping_resumes_after_cycles_ledger_becomes_available() {
 
     // Advance well past the first hourly interval and process messages, giving
     // the canister time to run housekeeping with a working cycles ledger.
-    pic_setup.pic.advance_time(Duration::from_secs(2 * 60 * 60));
+    pic_setup.pic.advance_time(Duration::from_hours(2));
     for _ in 0..20 {
         pic_setup.pic.tick();
     }

src/frontend/src/env/oisy.metadata.json

@@ -24,5 +24,6 @@
 	"OISY_LOGGING_INTO_OISY_URL": "https://docs.oisy.com/using-oisy-wallet/how-tos/logging-into-oisy",
 	"OISY_CREATING_A_WALLET_URL": "https://docs.oisy.com/using-oisy-wallet/how-tos/creating-a-wallet",
 	"OISY_SCAN_URL": "https://docs.oisy.com/using-oisy-wallet/how-tos/universal-scanner",
-	"OISY_PAY_URL": "https://docs.oisy.com/using-oisy-wallet/oisy-pay"
+	"OISY_PAY_URL": "https://docs.oisy.com/using-oisy-wallet/oisy-pay",
+	"OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL": "https://docs.oisy.com/introduction/oisy-keeps-you-protected#filter-for-small-transactions"
 }

src/frontend/src/env/schema/env-oisy-metadata.schema.ts

@@ -26,5 +26,6 @@ export const OisyMetadataSchema = z.object({
 	OISY_LOGGING_INTO_OISY_URL: z.url(),
 	OISY_CREATING_A_WALLET_URL: z.url(),
 	OISY_SCAN_URL: z.url(),
-	OISY_PAY_URL: z.url()
+	OISY_PAY_URL: z.url(),
+	OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL: z.url()
 });

src/frontend/src/lib/components/settings/Settings.svelte

@@ -12,6 +12,7 @@
 	import Button from '$lib/components/ui/Button.svelte';
 	import Copy from '$lib/components/ui/Copy.svelte';
 	import ExternalLink from '$lib/components/ui/ExternalLink.svelte';
+	import { OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL } from '$lib/constants/oisy.constants';
 	import {
 		SETTINGS_ACTIVE_NETWORKS_EDIT_BUTTON,
 		SETTINGS_ADDRESS_LABEL,
@@ -138,7 +139,7 @@
 
 				<ExternalLink
 					ariaLabel={$i18n.settings.text.learn_more}
-					href="https://support.oisy.com/hc/hidden-transactions"
+					href={OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL}
 					iconVisible={false}>{$i18n.settings.text.learn_more}</ExternalLink
 				>
 			</span>

src/frontend/src/lib/constants/oisy.constants.ts

@@ -28,7 +28,8 @@ export const {
 	OISY_LOGGING_INTO_OISY_URL,
 	OISY_CREATING_A_WALLET_URL,
 	OISY_SCAN_URL,
-	OISY_PAY_URL
+	OISY_PAY_URL,
+	OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL
 } = safeParse({
 	schema: OisyMetadataSchema,
 	value: metadata,
@@ -58,7 +59,8 @@ export const {
 		OISY_LOGGING_INTO_OISY_URL: '',
 		OISY_CREATING_A_WALLET_URL: '',
 		OISY_SCAN_URL: '',
-		OISY_PAY_URL: ''
+		OISY_PAY_URL: '',
+		OISY_HIDE_MICRO_TRANSACTIONS_DOCS_URL: ''
 	}
 });