Merge pull request #1039 from tonwhales/release/v2.3.13

Release/v2.3.13
tonwhales · Sep 11, 2024 · 726b20c · 726b20c
2 parents c26cdb6 + 478e263
commit 726b20c
Show file tree

Hide file tree

Showing 63 changed files with 845 additions and 310 deletions.
diff --git a/VERSION_CODE b/VERSION_CODE
@@ -1 +1 @@
-206
+207
diff --git a/app/Navigation.tsx b/app/Navigation.tsx
@@ -96,6 +96,8 @@ import { PendingTxsWatcher } from './components/PendingTxsWatcher';
 import { TonconnectWatcher } from './components/TonconnectWatcher';
 import { SessionWatcher } from './components/SessionWatcher';
 import { MandatoryAuthSetupFragment } from './fragments/secure/MandatoryAuthSetupFragment';
+import { WebViewPreloader } from './components/WebViewPreloader';
+import { holdersUrl } from './engine/api/holders/fetchUserState';
 
 const Stack = createNativeStackNavigator();
 Stack.Navigator.displayName = 'MainStack';
@@ -469,6 +471,7 @@ export const Navigation = memo(() => {
             <PendingTxsWatcher />
             <TonconnectWatcher />
             <SessionWatcher navRef={navigationRef} />
+            <WebViewPreloader url={holdersUrl(isTestnet)} />
             <Splash hide={hideSplash} />
         </View>
     );

diff --git a/app/analytics/mixpanel.ts b/app/analytics/mixpanel.ts
@@ -13,6 +13,8 @@ export enum MixpanelEvent {
     HoldersEnrollment = 'holders_entrollment',
     HoldersInfo = 'holders_info',
     HoldersInfoClose = 'holders_info_close',
+    HoldersLoadingTime = 'holders_loading_time',
+    holdersLongLoadingTime = 'holders_long_loading_time',
     HoldersEnrollmentClose = 'holders_entrollment_close',
     HoldersClose = 'holders_close',
     Connect = 'connect',

diff --git a/app/components/ScreenHeader.tsx b/app/components/ScreenHeader.tsx
@@ -128,7 +128,7 @@ export const ScreenHeader = memo((
             <View style={{
                 flexDirection: 'row', alignItems: 'center',
                 height: 44,
-                marginTop: 14,
+                marginTop: 14
             }}>
                 <View style={{
                     position: 'absolute', top: 0, bottom: 0, left: 0, right: 0,

diff --git a/app/components/ShareButton.tsx b/app/components/ShareButton.tsx
@@ -4,6 +4,7 @@ import ShareIcon from '@assets/ic_share_address.svg';
 import { t } from "../i18n/t";
 import Share from 'react-native-share';
 import { useTheme } from "../engine/hooks";
+import { useToaster } from "./toast/ToastProvider";
 
 const size = {
     height: 56,
@@ -28,17 +29,25 @@ export const ShareButton = memo(({
     onScreenCapture?: () => Promise<{ uri: string }>
 }) => {
     const theme = useTheme();
+    const toaster = useToaster();
     const onShare = useCallback(async () => {
         let screenShot: { uri: string } | undefined;
         if (onScreenCapture) {
             screenShot = await onScreenCapture();
         }
 
-        Share.open({
-            title: t('receive.share.title'),
-            message: body,
-            url: screenShot?.uri,
-        });
+        try {
+            await Share.open({
+                title: t('receive.share.title'),
+                message: body,
+                url: screenShot?.uri,
+            });
+        } catch {
+            toaster.show({
+                type: 'error',
+                message: t('receive.share.error')
+            });
+        }
     }, [body]);
 
     return (

diff --git a/app/components/WebViewPreloader.tsx b/app/components/WebViewPreloader.tsx
@@ -0,0 +1,14 @@
+import { memo } from "react";
+import { View } from "react-native";
+import WebView from "react-native-webview";
+
+export const WebViewPreloader = memo(({ url }: { url: string }) => {
+    return (
+        <View
+            style={{ height: 0, width: 0, opacity: 0 }}
+            pointerEvents={"none"}
+        >
+            <WebView source={{ uri: url }} />
+        </View>
+    );
+});
diff --git a/app/components/browser/BrowserExtensions.tsx b/app/components/browser/BrowserExtensions.tsx
@@ -11,7 +11,7 @@ import { extractDomain } from "../../engine/utils/extractDomain";
 import { useBottomTabBarHeight } from "@react-navigation/bottom-tabs";
 import { useDimensions } from "@react-native-community/hooks";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { holdersUrl as resolveHoldersUrl } from '../../engine/api/holders/fetchAccountState';
+import { holdersUrl as resolveHoldersUrl } from '../../engine/api/holders/fetchUserState';
 import { Typography } from "../styles";
 import { ConnectedApp } from "../../engine/hooks/dapps/useTonConnectExtenstions";
 

diff --git a/app/components/products/HoldersAccountItem.tsx b/app/components/products/HoldersAccountItem.tsx
@@ -7,7 +7,7 @@ import { useTypedNavigation } from "../../utils/useTypedNavigation";
 import Animated from "react-native-reanimated";
 import { useAnimatedPressedInOut } from "../../utils/useAnimatedPressedInOut";
 import { useIsConnectAppReady, useJettonContent, usePrice, useTheme } from "../../engine/hooks";
-import { HoldersAccountState, holdersUrl } from "../../engine/api/holders/fetchAccountState";
+import { HoldersUserState, holdersUrl } from "../../engine/api/holders/fetchUserState";
 import { GeneralHoldersAccount, GeneralHoldersCard } from "../../engine/api/holders/fetchAccounts";
 import { PerfText } from "../basic/PerfText";
 import { Typography } from "../styles";
@@ -18,7 +18,7 @@ import { HoldersAccountStatus } from "../../engine/hooks/holders/useHoldersAccou
 import { WImage } from "../WImage";
 import { toBnWithDecimals } from "../../utils/withDecimals";
 import { toNano } from "@ton/core";
-import { HoldersAppParams } from "../../fragments/holders/HoldersAppFragment";
+import { HoldersAppParams, HoldersAppParamsType } from "../../fragments/holders/HoldersAppFragment";
 import { getAccountName } from "../../utils/holders/getAccountName";
 
 import IcTonIcon from '@assets/ic-ton-acc.svg';
@@ -70,7 +70,7 @@ export const HoldersAccountItem = memo((props: {
             return true;
         }
 
-        if (holdersAccStatus.state === HoldersAccountState.NeedEnrollment) {
+        if (holdersAccStatus.state === HoldersUserState.NeedEnrollment) {
             return true;
         }
 
@@ -86,12 +86,12 @@ export const HoldersAccountItem = memo((props: {
         props.onBeforeOpen?.();
 
         if (needsEnrollment) {
-            const onEnrollType: HoldersAppParams = { type: 'account', id: props.account.id };
+            const onEnrollType: HoldersAppParams = { type: HoldersAppParamsType.Account, id: props.account.id };
             navigation.navigateHoldersLanding({ endpoint: url, onEnrollType }, props.isTestnet);
             return;
         }
 
-        navigation.navigateHolders({ type: 'account', id: props.account.id }, props.isTestnet);
+        navigation.navigateHolders({ type: HoldersAppParamsType.Account, id: props.account.id }, props.isTestnet);
     }, [props.account, needsEnrollment, props.isTestnet]);
 
     const { onPressIn, onPressOut, animatedStyle } = useAnimatedPressedInOut();

diff --git a/app/components/products/HoldersPrepaidCard.tsx b/app/components/products/HoldersPrepaidCard.tsx
@@ -6,7 +6,7 @@ import { useTypedNavigation } from "../../utils/useTypedNavigation";
 import Animated from "react-native-reanimated";
 import { useAnimatedPressedInOut } from "../../utils/useAnimatedPressedInOut";
 import { useIsConnectAppReady, useTheme } from "../../engine/hooks";
-import { HoldersAccountState, holdersUrl } from "../../engine/api/holders/fetchAccountState";
+import { HoldersUserState, holdersUrl } from "../../engine/api/holders/fetchUserState";
 import { GeneralHoldersCard, PrePaidHoldersCard } from "../../engine/api/holders/fetchAccounts";
 import { PerfText } from "../basic/PerfText";
 import { Typography } from "../styles";
@@ -15,7 +15,7 @@ import { toNano } from "@ton/core";
 import { CurrencySymbols } from "../../utils/formatCurrency";
 import { HoldersAccountCard } from "./HoldersAccountCard";
 import { HoldersAccountStatus } from "../../engine/hooks/holders/useHoldersAccountStatus";
-import { HoldersAppParams } from "../../fragments/holders/HoldersAppFragment";
+import { HoldersAppParams, HoldersAppParamsType } from "../../fragments/holders/HoldersAppFragment";
 import { useLockAppWithAuthState } from "../../engine/hooks/settings";
 
 export const HoldersPrepaidCard = memo((props: {
@@ -50,7 +50,7 @@ export const HoldersPrepaidCard = memo((props: {
             return true;
         }
 
-        if (holdersAccStatus.state === HoldersAccountState.NeedEnrollment) {
+        if (holdersAccStatus.state === HoldersUserState.NeedEnrollment) {
             return true;
         }
 
@@ -62,12 +62,12 @@ export const HoldersPrepaidCard = memo((props: {
         props.onBeforeOpen?.();
 
         if (needsEnrollment) {
-            const onEnrollType: HoldersAppParams = { type: 'prepaid', id: card.id };
+            const onEnrollType: HoldersAppParams = { type: HoldersAppParamsType.Prepaid, id: card.id };
             navigation.navigateHoldersLanding({ endpoint: url, onEnrollType }, props.isTestnet);
             return;
         }
 
-        navigation.navigateHolders({ type: 'prepaid', id: card.id }, props.isTestnet);
+        navigation.navigateHolders({ type: HoldersAppParamsType.Prepaid, id: card.id }, props.isTestnet);
     }, [card, needsEnrollment, props.onBeforeOpen, props.isTestnet]);
 
     const { onPressIn, onPressOut, animatedStyle } = useAnimatedPressedInOut();

diff --git a/app/components/products/ProductsComponent.tsx b/app/components/products/ProductsComponent.tsx
@@ -13,7 +13,7 @@ import { JettonsHiddenComponent } from "./JettonsHiddenComponent"
 import { SelectedAccount } from "../../engine/types"
 import { DappsRequests } from "../../fragments/wallet/products/DappsRequests"
 import { ProductBanner } from "./ProductBanner"
-import { HoldersAccountState, holdersUrl } from "../../engine/api/holders/fetchAccountState"
+import { HoldersUserState, holdersUrl } from "../../engine/api/holders/fetchUserState"
 import { PendingTransactions } from "../../fragments/wallet/views/PendingTransactions"
 import { Typography } from "../styles"
 import { useBanners } from "../../engine/hooks/banners"
@@ -22,7 +22,8 @@ import { MixpanelEvent, trackEvent } from "../../analytics/mixpanel"
 import { AddressFormatUpdate } from "./AddressFormatUpdate"
 import { TonProductComponent } from "./TonProductComponent"
 import { SpecialJettonProduct } from "./SpecialJettonProduct"
-import { useIsHoldersWhitelisted } from "../../engine/hooks/holders/useIsHoldersWhitelisted"
+import { useIsHoldersInvited } from "../../engine/hooks/holders/useIsHoldersInvited"
+import { HoldersAppParamsType } from "../../fragments/holders/HoldersAppFragment"
 
 import OldWalletIcon from '@assets/ic_old_wallet.svg';
 
@@ -37,11 +38,11 @@ export const ProductsComponent = memo(({ selected }: { selected: SelectedAccount
     const banners = useBanners();
     const url = holdersUrl(isTestnet);
     const isHoldersReady = useIsConnectAppReady(url);
-    const isHoldersWhitelisted = useIsHoldersWhitelisted(selected!.address, isTestnet);
-    const showHoldersBuiltInBanner = (holdersAccounts?.accounts?.length ?? 0) === 0 && isHoldersWhitelisted;
+    const isHoldersInvited = useIsHoldersInvited(selected!.address, isTestnet);
+    const showHoldersBuiltInBanner = (holdersAccounts?.accounts?.length ?? 0) === 0 && isHoldersInvited;
 
     const needsEnrolment = useMemo(() => {
-        if (holdersAccStatus?.state === HoldersAccountState.NeedEnrollment) {
+        if (holdersAccStatus?.state === HoldersUserState.NeedEnrollment) {
             return true;
         }
         return false;
@@ -67,10 +68,10 @@ export const ProductsComponent = memo(({ selected }: { selected: SelectedAccount
 
     const onHoldersPress = useCallback(() => {
         if (needsEnrolment || !isHoldersReady) {
-            navigation.navigateHoldersLanding({ endpoint: url, onEnrollType: { type: 'create' } }, isTestnet);
+            navigation.navigateHoldersLanding({ endpoint: url, onEnrollType: { type: HoldersAppParamsType.Create } }, isTestnet);
             return;
         }
-        navigation.navigateHolders({ type: 'create' }, isTestnet);
+        navigation.navigateHolders({ type: HoldersAppParamsType.Create }, isTestnet);
     }, [needsEnrolment, isHoldersReady, isTestnet]);
 
     const onProductBannerPress = useCallback((product: ProductAd) => {
@@ -102,7 +103,7 @@ export const ProductsComponent = memo(({ selected }: { selected: SelectedAccount
                 <DappsRequests />
                 <PendingTransactions />
 
-                {(!isHoldersWhitelisted && !!banners?.product) && (
+                {(!isHoldersInvited && !!banners?.product) && (
                     <View style={{ paddingHorizontal: 16, marginVertical: 16 }}>
                         <ProductBanner
                             title={banners.product.title}
@@ -117,7 +118,7 @@ export const ProductsComponent = memo(({ selected }: { selected: SelectedAccount
                 {showHoldersBuiltInBanner && (
                     <View style={{
                         paddingHorizontal: 16, marginBottom: 16,
-                        marginTop: (!isHoldersWhitelisted && !!banners?.product) ? 0 : 16
+                        marginTop: (!isHoldersInvited && !!banners?.product) ? 0 : 16
                     }}>
                         <ProductBanner
                             title={t('products.holders.card.defaultTitle')}
@@ -131,7 +132,7 @@ export const ProductsComponent = memo(({ selected }: { selected: SelectedAccount
 
                 <View style={{
                     marginHorizontal: 16, marginBottom: 16,
-                    marginTop: (showHoldersBuiltInBanner || (!isHoldersWhitelisted && !!banners?.product)) ? 0 : 16
+                    marginTop: (showHoldersBuiltInBanner || (!isHoldersInvited && !!banners?.product)) ? 0 : 16
                 }}>
                     <Text style={[{ color: theme.textPrimary, }, Typography.semiBold20_28]}>
                         {t('common.balances')}

diff --git a/app/components/toast/ToastProvider.tsx b/app/components/toast/ToastProvider.tsx
@@ -115,7 +115,7 @@ export const Toast = memo(({
                 {Icon && (
                     <Icon height={24} width={24} style={{ height: 24, width: 24, marginRight: 12 }} color={theme.white} />
                 )}
-                <Text style={[{ fontSize: 15, lineHeight: 20, textAlign: !!Icon ? 'left' : 'center' }, ToastStyle[type].text]}>
+                <Text style={[{ fontSize: 15, lineHeight: 20, textAlign: !!Icon ? 'left' : 'center', flexShrink: 1 }, ToastStyle[type].text]}>
                     {message}
                 </Text>
             </View>

diff --git a/app/components/webview/DAppWebView.tsx b/app/components/webview/DAppWebView.tsx
@@ -1,5 +1,5 @@
 import { ForwardedRef, RefObject, forwardRef, memo, useCallback, useEffect, useMemo, useReducer, useState } from "react";
-import { KeyboardAvoidingView, Platform, View, StyleSheet, ActivityIndicator, BackHandler } from "react-native";
+import { KeyboardAvoidingView, Platform, View, StyleSheet, ActivityIndicator, BackHandler, Linking } from "react-native";
 import WebView, { WebViewMessageEvent, WebViewNavigation, WebViewProps } from "react-native-webview";
 import { useNetwork, useTheme } from "../../engine/hooks";
 import { WebViewErrorComponent } from "./WebViewErrorComponent";
@@ -22,10 +22,11 @@ import DeviceInfo from 'react-native-device-info';
 import { processEmitterMessage } from "./utils/processEmitterMessage";
 import { getLastAuthTimestamp, useKeysAuth } from "../secure/AuthWalletKeys";
 import { getLockAppWithAuthState } from "../../engine/state/lockAppWithAuthState";
-import { useLockAppWithAuthState } from "../../engine/hooks/settings";
 import WalletService, { addCardRequestSchema } from "../../modules/WalletService";
 import { getHoldersToken } from "../../engine/hooks/holders/useHoldersAccountStatus";
 import { getCurrentAddress } from "../../storage/appState";
+import { WebViewSourceUri } from "react-native-webview/lib/WebViewTypes";
+import { holdersUrl } from "../../engine/api/holders/fetchUserState";
 
 export type DAppWebViewProps = WebViewProps & {
     useMainButton?: boolean;
@@ -72,7 +73,6 @@ export const DAppWebView = memo(forwardRef((props: DAppWebViewProps, ref: Forwar
     const navigation = useTypedNavigation();
     const toaster = useToaster();
     const markRefIdShown = useMarkBannerHidden();
-    const [, setLockAppWithAuth] = useLockAppWithAuthState();
 
     const [loaded, setLoaded] = useState(false);
 
@@ -98,15 +98,28 @@ export const DAppWebView = memo(forwardRef((props: DAppWebViewProps, ref: Forwar
         }
     );
 
+
+
     const safelyOpenUrl = useCallback((url: string) => {
         try {
+            const scheme = new URL(url).protocol.replace(':', '');
+            const sourceUrl = (props.source as WebViewSourceUri)?.uri;
+
+            if (
+                scheme === 'tg'
+                && !!sourceUrl
+                && sourceUrl.startsWith(holdersUrl(isTestnet))
+            ) {
+                Linking.openURL(url);
+                return;
+            }
             let pageDomain = extractDomain(url);
             if (isSafeDomain(pageDomain)) {
                 openWithInApp(url);
                 return;
             }
         } catch { }
-    }, []);
+    }, [props.source]);
 
     const onNavigation = useCallback((url: string) => {
         if (!props.useQueryAPI) {
@@ -331,11 +344,7 @@ export const DAppWebView = memo(forwardRef((props: DAppWebViewProps, ref: Forwar
         // Basic open url
         if (data.name === 'openUrl' && data.args.url) {
             try {
-                let pageDomain = extractDomain(data.args.url);
-                if (isSafeDomain(pageDomain)) {
-                    openWithInApp(data.args.url);
-                    return;
-                }
+                safelyOpenUrl(data.args.url);
             } catch {
                 warn('Failed to open url');
                 return;

diff --git a/app/components/webview/utils/processEmitterMessage.ts b/app/components/webview/utils/processEmitterMessage.ts
@@ -20,7 +20,7 @@ export function processEmitterMessage(
             case DAppEmitterEvents.APP_READY:
                 setTimeout(() => {
                     setLoaded(true);
-                }, 200);
+                }, 100);
                 break;
             default:
                 break;

diff --git a/app/engine/api/holders/fetchAccounts.ts b/app/engine/api/holders/fetchAccounts.ts
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { Address } from "@ton/core";
 import { z } from "zod";
-import { holdersEndpoint } from "./fetchAccountState";
+import { holdersEndpoint } from "./fetchUserState";
 
 const networksSchema = z.union([
   z.literal('ton-mainnet'),