Merge commit 'df1499047ccc8f39d756d5beba60651237aca1c0' into beta

apps/app/src/api/auth.rs

@@ -122,16 +122,13 @@ pub async fn login<R: Runtime>(
             .url()?
             .as_str()
             .starts_with("https://login.live.com/oauth20_desktop.srf")
-        {
-            if let Some((_, code)) =
+            && let Some((_, code)) =
                 window.url()?.query_pairs().find(|x| x.0 == "code")
-            {
-                window.close()?;
-                let val =
-                    minecraft_auth::finish_login(&code.clone(), flow).await?;
+        {
+            window.close()?;
+            let val = minecraft_auth::finish_login(&code.clone(), flow).await?;
 
-                return Ok(Some(val));
-            }
+            return Ok(Some(val));
         }
 
         tokio::time::sleep(std::time::Duration::from_millis(50)).await;

apps/app/src/api/utils.rs

@@ -103,11 +103,11 @@ pub async fn should_disable_mouseover() -> bool {
         // We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
         if let tauri_plugin_os::Version::Semantic(major, minor, _) =
             tauri_plugin_os::version()
+            && major >= 12
+            && minor >= 3
         {
-            if major >= 12 && minor >= 3 {
-                // Mac os version is 12.3 or higher, we allow mouseover
-                return false;
-            }
+            // Mac os version is 12.3 or higher, we allow mouseover
+            return false;
         }
         true
     } else {