gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'main'

Browse Source 
AW-429-comp-v1-ios-ab

See merge request witapp/aura-webapp!724
This commit is contained in:
Daniil Chemerkin 2025-04-10 14:50:00 +00:00
commit 7f349a5b01
6 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/CompatibilityV2/pages/Camera/android/index.tsx
View File

@ -82,18 +82,18 @@ function AndroidCamera() {
} }
const handleRequestCameraModalAllow = () => { const handleRequestCameraModalAllow = () => {
if (isInstagramAndroid) { // if (isInstagramAndroid) {
return handleToScanHand() // return handleToScanHand()
} // }
setIsCameraModalOpen(true) setIsCameraModalOpen(true)
setIsRequestCameraModalOpen(false) setIsRequestCameraModalOpen(false)
} }
useEffect(() => { useEffect(() => {
if (!isShowCameraRequestModal) { if (!isShowCameraRequestModal) {
if (isInstagramAndroid) { // if (isInstagramAndroid) {
return handleToScanHand() // return handleToScanHand()
} // }
setIsCameraModalOpen(true) setIsCameraModalOpen(true)
} }
}, [isShowCameraRequestModal]) }, [isShowCameraRequestModal])
@ -317,9 +317,9 @@ function AndroidCamera() {
<span>{translate("/camera.no_access_camera")}</span> <span>{translate("/camera.no_access_camera")}</span>
<div className={styles["toast-buttons-container"]}> <div className={styles["toast-buttons-container"]}>
<button onClick={() => { <button onClick={() => {
if (isInstagramAndroid) { // if (isInstagramAndroid) {
return handleToScanHand() // return handleToScanHand()
} // }
setToastVisible(null) setToastVisible(null)
setIsCameraModalOpen(true) setIsCameraModalOpen(true)
}}> }}>

4
src/components/CompatibilityV2/pages/Gender/index.tsx
View File

@ -19,7 +19,7 @@ import { EUnleashFlags, useUnleash } from "@/hooks/ab/unleash/useUnleash";
import GenderV0 from "./variants/GenderV0"; import GenderV0 from "./variants/GenderV0";
import GenderV1 from "./variants/GenderV1"; import GenderV1 from "./variants/GenderV1";
import GenderV2 from "./variants/GenderV2"; import GenderV2 from "./variants/GenderV2";
import { instagramToBrowser } from "@/services/hacks/insta-to-browser"; import { webviewToSystemBrowser } from "@/services/hacks/webviewToSystemBrowser";
function GenderPage() { function GenderPage() {
const { translate } = useTranslations(ELocalesPlacement.CompatibilityV2); const { translate } = useTranslations(ELocalesPlacement.CompatibilityV2);
@ -103,7 +103,7 @@ function GenderPage() {
useEffect(() => { useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) { if (privacyPolicyChecked && gender && isSelected) {
instagramToBrowser(["android"]); webviewToSystemBrowser(["android"]);
handleNext(); handleNext();
} }
}, [gender, handleNext, isSelected, privacyPolicyChecked]); }, [gender, handleNext, isSelected, privacyPolicyChecked]);

4
src/components/CompatibilityV3/pages/Gender/index.tsx
View File

@ -19,7 +19,7 @@ import { EGender, ESourceAuthorization } from "@/api/resources/User";
import AlreadyHaveAccount from "@/components/ui/AlreadyHaveAccount"; import AlreadyHaveAccount from "@/components/ui/AlreadyHaveAccount";
import Answer from "../../components/Answer"; import Answer from "../../components/Answer";
import Loader, { LoaderColor } from "@/components/Loader"; import Loader, { LoaderColor } from "@/components/Loader";
import { instagramToBrowser } from "@/services/hacks/insta-to-browser"; import { webviewToSystemBrowser } from "@/services/hacks/webviewToSystemBrowser";
function GenderPage() { function GenderPage() {
const { translate } = useTranslations(ELocalesPlacement.CompatibilityV3); const { translate } = useTranslations(ELocalesPlacement.CompatibilityV3);
@ -96,7 +96,7 @@ function GenderPage() {
useEffect(() => { useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) { if (privacyPolicyChecked && gender && isSelected) {
instagramToBrowser(["android"]); webviewToSystemBrowser(["android"]);
handleNext(); handleNext();
} }
}, [gender, handleNext, isSelected, privacyPolicyChecked]); }, [gender, handleNext, isSelected, privacyPolicyChecked]);

4
src/components/CompatibilityV4/pages/Gender/index.tsx
View File

@ -17,7 +17,7 @@ import Loader, { LoaderColor } from "@/components/Loader";
import GenderV0 from "./variants/GenderV0"; import GenderV0 from "./variants/GenderV0";
import GenderV1 from "./variants/GenderV1"; import GenderV1 from "./variants/GenderV1";
import GenderV2 from "./variants/GenderV2"; import GenderV2 from "./variants/GenderV2";
import { instagramToBrowser } from "@/services/hacks/insta-to-browser"; import { webviewToSystemBrowser } from "@/services/hacks/webviewToSystemBrowser";
function GenderPage() { function GenderPage() {
const { translate } = useTranslations(ELocalesPlacement.CompatibilityV4); const { translate } = useTranslations(ELocalesPlacement.CompatibilityV4);
@ -94,7 +94,7 @@ function GenderPage() {
useEffect(() => { useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) { if (privacyPolicyChecked && gender && isSelected) {
instagramToBrowser(["android"]); webviewToSystemBrowser(["android"]);
handleNext(); handleNext();
} }
}, [gender, handleNext, isSelected, privacyPolicyChecked]); }, [gender, handleNext, isSelected, privacyPolicyChecked]);

4
src/components/PalmistryV1/pages/GenderPalmistry/index.tsx
View File

@ -18,7 +18,7 @@ import { useSession } from "@/hooks/session/useSession";
import { EGender, ESourceAuthorization } from "@/api/resources/User"; import { EGender, ESourceAuthorization } from "@/api/resources/User";
import AlreadyHaveAccount from "@/components/ui/AlreadyHaveAccount"; import AlreadyHaveAccount from "@/components/ui/AlreadyHaveAccount";
import Answer from "../../components/Answer"; import Answer from "../../components/Answer";
import { instagramToBrowser } from "@/services/hacks/insta-to-browser"; import { webviewToSystemBrowser } from "@/services/hacks/webviewToSystemBrowser";
function GenderPalmistry() { function GenderPalmistry() {
const { translate } = useTranslations(ELocalesPlacement.PalmistryV1); const { translate } = useTranslations(ELocalesPlacement.PalmistryV1);
@ -84,7 +84,7 @@ function GenderPalmistry() {
useEffect(() => { useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) { if (privacyPolicyChecked && gender && isSelected) {
instagramToBrowser(["android"]); webviewToSystemBrowser(["android"]);
handleNext(); handleNext();
} }
}, [gender, handleNext, isSelected, privacyPolicyChecked]); }, [gender, handleNext, isSelected, privacyPolicyChecked]);

6
src/services/hacks/insta-to-browser.ts → src/services/hacks/webviewToSystemBrowser.ts
View File

@ -1,7 +1,9 @@
export const instagramToBrowser = (includeSystems: Array<"android" | "ios">) => { export const webviewToSystemBrowser = (includeSystems: Array<"android" | "ios">) => {
const ua = window.navigator.userAgent; const ua = window.navigator.userAgent;
if ( if (
ua.includes("Instagram") ua.includes("Instagram") ||
ua.includes("FBAN") ||
ua.includes("FBAV")
) { ) {
if (includeSystems.includes("ios") && /iPad|iPhone|iPod/.test(ua)) { if (includeSystems.includes("ios") && /iPad|iPhone|iPod/.test(ua)) {
window.location.href = "x-safari-" + window.location.href; window.location.href = "x-safari-" + window.location.href;