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!728
This commit is contained in:
Daniil Chemerkin 2025-04-13 21:24:15 +00:00
commit 7d60bd2d3e
11 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -5,7 +5,7 @@
<script>
const ua = window.navigator.userAgent;
if (
ua.includes("Instagram")
ua.includes("Instagram")// || ua.includes("FBAN") || ua.includes("FBAV") || ua.includes("FBIOS")
) {
if (/iPad|iPhone|iPod/.test(ua)) {
window.location.href = "x-safari-" + window.location.href;

3
src/components/CompatibilityV2/components/CameraModal/index.tsx
View File

@ -21,6 +21,7 @@ interface CameraModalProps {
onClose: () => void;
onTakePhoto: (photo: string) => void;
onError: (error: string | DOMException) => void;
onVideoReady?: () => void;
reinitializeKey?: number; // for reinitializing the camera (change the key to reinitialize the camera)
isCameraVisible?: boolean;
}
@ -29,6 +30,7 @@ function CameraModal({
onClose,
onTakePhoto,
onError,
onVideoReady,
reinitializeKey = 0,
isCameraVisible = true
}: CameraModalProps) {
@ -81,6 +83,7 @@ function CameraModal({
const onUserMedia = (stream: MediaStream) => {
setIsVideoReady(true);
onVideoReady?.();
const track = stream.getVideoTracks()[0];
if (track) {
checkTorchAvailability(track);

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

@ -19,6 +19,7 @@ import { DataURIToBlob } from "@/services/data";
import metricService, { EGoals, EMetrics } from "@/services/metric/metricService";
import { EUnleashFlags, useUnleash } from "@/hooks/ab/unleash/useUnleash";
import { checkCameraPermissionState } from "@/services/permission/permisson";
import { isAndroid, isWebView } from "@/services/hacks/webviewToSystemBrowser";
enum EToastVisible {
"try_again" = "try_again",
@ -28,7 +29,7 @@ enum EToastVisible {
"upload_photo" = "upload_photo",
}
const isInstagramAndroid = window?.navigator?.userAgent?.includes("Instagram") && /Android/.test(window?.navigator?.userAgent);
const isWebViewAndroid = isWebView() && isAndroid;
function AndroidCamera() {
const api = useApi();
@ -48,10 +49,17 @@ function AndroidCamera() {
const isShowScanHand = compatibilityV2ScanHand !== "hide";
const { variant: compatibilityV2TimeForCameraInit } = useUnleash({
flag: EUnleashFlags.compatibilityV2TimeForCameraInit
});
const timeForCameraInit = Number(compatibilityV2TimeForCameraInit) || 6000;
const [isCameraModalOpen, setIsCameraModalOpen] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [isRequestCameraModalOpen, setIsRequestCameraModalOpen] = useState(isShowCameraRequestModal);
const [toastVisible, setToastVisible] = useState<EToastVisible | null>(null);
const [isVideoReady, setIsVideoReady] = useState(false);
const handleToScanHand = () => {
metricService.reachGoal(EGoals.SCAN_ARTIFICIAL_PHOTO, [EMetrics.YANDEX, EMetrics.KLAVIYO]);
@ -75,23 +83,39 @@ function AndroidCamera() {
onTakePhoto(photo)
}
const handleRequestCameraModalCancel = () => {
setIsRequestCameraModalOpen(false)
setToastVisible(EToastVisible.no_access_camera)
}
const handleRequestCameraModalAllow = () => {
// if (isInstagramAndroid) {
// if (isWebViewAndroid) {
// return handleToScanHand()
// }
setIsCameraModalOpen(true)
setIsRequestCameraModalOpen(false)
}
useEffect(() => {
if (!isCameraModalOpen || !isWebViewAndroid || !isReady || compatibilityV2TimeForCameraInit === "disabled") return;
const timer = setTimeout(() => {
if (isShowScanHand) {
handleToScanHand();
} else {
setToastVisible(EToastVisible.upload_photo)
}
}, timeForCameraInit);
if (isVideoReady) {
clearTimeout(timer);
}
return () => clearTimeout(timer);
}, [isCameraModalOpen, isVideoReady, isReady, timeForCameraInit])
useEffect(() => {
if (!isShowCameraRequestModal) {
// if (isInstagramAndroid) {
// if (isWebViewAndroid) {
// return handleToScanHand()
// }
setIsCameraModalOpen(true)
@ -108,10 +132,10 @@ function AndroidCamera() {
}, [])
useEffect(() => {
if (isInstagramAndroid) {
if (isWebViewAndroid) {
metricService.reachGoal(EGoals.CAMERA_ANDROID_INSTAGRAM, [EMetrics.YANDEX, EMetrics.KLAVIYO]);
}
}, [isInstagramAndroid])
}, [isWebViewAndroid])
// LOGIC TODO: Make hook
@ -275,6 +299,7 @@ function AndroidCamera() {
onTakePhoto={handleCameraSuccess}
onError={handleCameraError}
isCameraVisible={isCameraModalOpen}
onVideoReady={() => setIsVideoReady(true)}
// reinitializeKey={reinitializeCameraCount}
/>}
@ -317,7 +342,7 @@ function AndroidCamera() {
<span>{translate("/camera.no_access_camera")}</span>
<div className={styles["toast-buttons-container"]}>
<button onClick={() => {
// if (isInstagramAndroid) {
// if (isWebViewAndroid) {
// return handleToScanHand()
// }
setToastVisible(null)

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

@ -103,7 +103,7 @@ function GenderPage() {
useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) {
webviewToSystemBrowser(["android"]);
webviewToSystemBrowser(["android", "ios"]);
handleNext();
}
}, [gender, handleNext, isSelected, privacyPolicyChecked]);

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

@ -96,8 +96,8 @@ function GenderPage() {
useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) {
webviewToSystemBrowser(["android"]);
handleNext();
webviewToSystemBrowser(["android", "ios"]);
handleNext();
}
}, [gender, handleNext, isSelected, privacyPolicyChecked]);

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

@ -94,7 +94,7 @@ function GenderPage() {
useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) {
webviewToSystemBrowser(["android"]);
webviewToSystemBrowser(["android", "ios"]);
handleNext();
}
}, [gender, handleNext, isSelected, privacyPolicyChecked]);

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

@ -84,7 +84,7 @@ function GenderPalmistry() {
useEffect(() => {
if (privacyPolicyChecked && gender && isSelected) {
webviewToSystemBrowser(["android"]);
webviewToSystemBrowser(["android", "ios"]);
handleNext();
}
}, [gender, handleNext, isSelected, privacyPolicyChecked]);

4
src/hooks/ab/unleash/useUnleash.ts
View File

@ -25,7 +25,8 @@ export enum EUnleashFlags {
"compatibilityV1EmailEnter" = "compatibilityV1EmailEnter",
"compatibilityV2ScanHand" = "compatibilityV2ScanHand",
"preloadImages" = "preloadImages",
"scanHandTimeCompatibilityV2" = "scanHandTimeCompatibilityV2"
"scanHandTimeCompatibilityV2" = "scanHandTimeCompatibilityV2",
"compatibilityV2TimeForCameraInit" = "compatibilityV2TimeForCameraInit"
}
interface IUseUnleashProps<T extends EUnleashFlags> {
@ -56,6 +57,7 @@ interface IVariants {
[EUnleashFlags.compatibilityV2ScanHand]: "show" | "hide";
[EUnleashFlags.preloadImages]: "yes" | "no";
[EUnleashFlags.scanHandTimeCompatibilityV2]: "v0" | "v1";
[EUnleashFlags.compatibilityV2TimeForCameraInit]: string;
}
/**

1
src/hooks/palmistry/useUploadImage.ts
View File

@ -70,6 +70,7 @@ export const useUploadImage = ({
};
const result = await getLines(event.target.files[0]);
const lines = result?.lines;
const reader = new FileReader();

19
src/hooks/session/useSession.ts
View File

@ -21,12 +21,15 @@ export const useSession = () => {
const [isError, setIsError] = useState(false);
const createSession = useCallback(async (source: ESourceAuthorization): Promise<ResponseCreate> => {
if (session[source]?.length) return {
sessionId: session[source],
status: "old"
if (session[source]?.length) {
localStorage.setItem(`${source}_sessionId`, session[source]);
return {
sessionId: session[source],
status: "old"
}
};
try {
const session = await api.createSession({
const sessionFromServer = await api.createSession({
feature,
locale: language,
timezone,
@ -35,13 +38,13 @@ export const useSession = () => {
signDate: dateOfCheck.length ? dateOfCheck : undefined,
utm
});
if (session?.sessionId?.length && session?.status === "success") {
if (sessionFromServer?.sessionId?.length && sessionFromServer?.status === "success") {
dispatch(actions.session.update({
session: session.sessionId,
session: sessionFromServer.sessionId,
source
}));
localStorage.setItem(`${source}_sessionId`, session.sessionId);
return session
localStorage.setItem(`${source}_sessionId`, sessionFromServer.sessionId);
return sessionFromServer
}
setIsError(true);
return {

29
src/services/hacks/webviewToSystemBrowser.ts
View File

@ -1,14 +1,17 @@
export const webviewToSystemBrowser = (includeSystems: Array<"android" | "ios">) => {
const ua = window.navigator.userAgent;
if (
ua.includes("Instagram") ||
ua.includes("FBAN") ||
ua.includes("FBAV")
) {
if (includeSystems.includes("ios") && /iPad|iPhone|iPod/.test(ua)) {
window.location.href = "x-safari-" + window.location.href;
} else if (includeSystems.includes("android") && /Android/.test(ua)) {
window.location.href = "intent:" + window.location.href + "#Intent;end";
}
}
const ua = window.navigator.userAgent;
export const isAndroid = /Android/.test(ua)
export const isWebView = () => {
return ua.includes("Instagram") || ua.includes("FBAN") || ua.includes("FBAV") || ua.includes("FBIOS");
}
export const webviewToSystemBrowser = (includeSystems: Array<"android" | "ios">) => {
if (!isWebView()) return;
if (includeSystems.includes("ios") && /iPad|iPhone|iPod/.test(ua)) {
window.location.href = "x-safari-" + window.location.href;
} else if (includeSystems.includes("android") && /Android/.test(ua)) {
window.location.href = "intent:" + window.location.href + "#Intent;end";
}
}