Merge pull request #1209 from tonwhales/release/v2.4.5

Release/v2.4.5
tonwhales · Dec 6, 2024 · d9922a9 · d9922a9
2 parents b710ccc + 7bf6564
commit d9922a9
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 38 deletions.
diff --git a/VERSION_CODE b/VERSION_CODE
@@ -1 +1 @@
-222
+223
diff --git a/app/components/products/HoldersAccountCard.tsx b/app/components/products/HoldersAccountCard.tsx
@@ -23,23 +23,12 @@ const cardImages = {
 
 export const HoldersAccountCard = memo(({ card, theme }: { card: GeneralHoldersCard, theme: ThemeType }) => {
     const [lockAppWithAuth] = useLockAppWithAuthState();
-    // TODO: remove this when we have the correct personalization code
-    // let imageType: 'holders' | 'classic' | 'whales' | 'black-pro' = 'classic';
+    // TODO: remove this when we have the correct personalization codes
     let imageType: 'holders' | 'classic' | 'whales' | 'black-pro' = 'black-pro';
-    // switch (card.personalizationCode) {
-    //     case 'holders':
-    //         imageType = 'holders';
-    //         break;
-    //     case 'whales':
-    //         imageType = 'whales';
-    //         break;
-    //     case 'black-pro':
-    //         imageType = 'black-pro';
-    //         break;
-    //     default:
-    //         imageType = 'classic';
-    //         break;
-    // }
+
+    if (card.provider === 'elysphere-kauri') {
+        imageType = 'classic';
+    }
 
     return (
         <PerfView style={{ width: 46, height: 30, borderRadius: 6 }}>

diff --git a/app/components/products/HoldersAccountItem.tsx b/app/components/products/HoldersAccountItem.tsx
@@ -76,10 +76,6 @@ export const HoldersAccountItem = memo((props: {
         return false;
     }, [holdersAccStatus, isHoldersReady]);
 
-    const isPro = useMemo(() => {
-        return props.account.cards.find((card) => card.personalizationCode === 'black-pro') !== undefined;
-    }, [props.account]);
-
     const onPress = useCallback(() => {
         // Close full list modal (holders navigations is below it in the other nav stack)
         props.onBeforeOpen?.();
@@ -93,9 +89,7 @@ export const HoldersAccountItem = memo((props: {
         navigation.navigateHolders({ type: HoldersAppParamsType.Account, id: props.account.id }, props.isTestnet);
     }, [props.account, needsEnrollment, props.isTestnet]);
 
-    const subtitle = isPro
-        ? t('products.holders.accounts.proAccount')
-        : t('products.holders.accounts.basicAccount');
+    const subtitle = t('products.holders.accounts.basicAccount');
 
     const renderRightAction = (!!props.rightActionIcon && !!props.rightAction)
         ? () => {

diff --git a/app/fragments/apps/components/protect/protectNavigation.ts b/app/fragments/apps/components/protect/protectNavigation.ts
@@ -9,6 +9,9 @@ export function protectNavigation(url: string, app: string) {
     if (pageDomain.endsWith('.sumsub.com')) {
         return true
     }
+    if (pageDomain.endsWith('.kauri.finance')) {
+        return true
+    }
     if (pageDomain.endsWith('.' + appDomain)) {
         return true;
     }

diff --git a/app/fragments/secure/components/TransferBatch.tsx b/app/fragments/secure/components/TransferBatch.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useEffect, useMemo, useRef } from "react";
-import { Alert, View, Text, ScrollView, Pressable, Image, Linking } from "react-native";
+import { Alert, View, Text, ScrollView, Pressable, Linking } from "react-native";
 import { MixpanelEvent, trackEvent } from "../../../analytics/mixpanel";
 import { contractFromPublicKey } from "../../../engine/contractFromPublicKey";
 import { SupportedMessage, parseMessageBody } from "../../../engine/transactions/parseMessageBody";
@@ -42,6 +42,7 @@ import Minimizer from "../../../modules/Minimizer";
 import { useWalletVersion } from "../../../engine/hooks/useWalletVersion";
 import { WalletContractV4, WalletContractV5R1 } from "@ton/ton";
 import { PendingTransactionStatus } from "../../../engine/state/pending";
+import { Image } from 'expo-image';
 
 import IcAlert from '@assets/ic-alert.svg';
 import IcTonIcon from '@assets/ic-ton-acc.svg';
@@ -838,20 +839,28 @@ export const TransferBatch = memo((props: ConfirmLoadedPropsBatch) => {
                                             </View>
                                         )}
                                         {(!i.message.addr.active) && (
-                                            <View style={{ flexDirection: 'row' }}>
+                                            <Pressable
+                                                style={({ pressed }) => ({ flexDirection: 'row', gap: 4, opacity: pressed ? 0.5 : 1 })}
+                                                onPress={() => {
+                                                    navigation.navigateAlert({
+                                                        title: t('transfer.error.addressIsNotActive'),
+                                                        message: t('transfer.error.addressIsNotActiveDescription')
+                                                    })
+                                                }}
+                                            >
+                                                <Image style={{ height: 18, width: 18 }} source={require('@assets/ic-info-round.png')} />
                                                 <Text
                                                     style={{
                                                         fontSize: 15, lineHeight: 20, fontWeight: '400',
                                                         color: theme.textSecondary,
                                                         flexShrink: 1
                                                     }}
-                                                    numberOfLines={1}
+                                                    numberOfLines={2}
                                                     ellipsizeMode={'tail'}
                                                 >
                                                     {t('transfer.addressNotActive')}
                                                 </Text>
-                                                <IcAlert style={{ height: 18, width: 18, marginLeft: 6 }} height={18} width={18} />
-                                            </View>
+                                            </Pressable>
                                         )}
                                         {i.spam && (
                                             <View style={{ flexDirection: 'row' }}>

diff --git a/app/fragments/secure/components/TransferSingleView.tsx b/app/fragments/secure/components/TransferSingleView.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
 import { memo, useCallback } from "react";
-import { ScrollView, View, Text, Pressable, Image, Alert } from "react-native";
+import { ScrollView, View, Text, Pressable, Alert } from "react-native";
 import { RoundButton } from "../../../components/RoundButton";
 import { t } from "../../../i18n/t";
 import { ItemGroup } from "../../../components/ItemGroup";
@@ -34,6 +34,7 @@ import { ForcedAvatar, ForcedAvatarType } from "../../../components/avatar/Force
 import { HoldersOp, HoldersOpView } from "../../../components/transfer/HoldersOpView";
 import { TransferEstimate } from "../TransferFragment";
 import { ItemSwitch } from "../../../components/Item";
+import { Image } from 'expo-image';
 
 import WithStateInit from '@assets/ic_sign_contract.svg';
 import IcAlert from '@assets/ic-alert.svg';
@@ -497,26 +498,26 @@ export const TransferSingleView = memo(({
                             </View>
                             {!target.active && (
                                 <Pressable
-                                    style={({ pressed }) => ({ flexDirection: 'row', marginTop: 4, opacity: pressed ? 0.5 : 1 })}
+                                    style={({ pressed }) => ({ flexDirection: 'row', marginTop: 4, opacity: pressed ? 0.5 : 1, gap: 4 })}
                                     onPress={() => {
                                         navigation.navigateAlert({
                                             title: t('transfer.error.addressIsNotActive'),
                                             message: t('transfer.error.addressIsNotActiveDescription')
                                         })
                                     }}
                                 >
+                                    <Image style={{ height: 18, width: 18 }} source={require('@assets/ic-info-round.png')} />
                                     <Text
                                         style={{
                                             fontSize: 15, lineHeight: 20, fontWeight: '400',
                                             color: theme.textSecondary,
                                             flexShrink: 1
                                         }}
-                                        numberOfLines={1}
+                                        numberOfLines={2}
                                         ellipsizeMode={'tail'}
                                     >
                                         {t('transfer.addressNotActive')}
                                     </Text>
-                                    <IcAlert style={{ height: 18, width: 18, marginLeft: 6 }} height={18} width={18} />
                                 </Pressable>
                             )}
                         </Pressable>

diff --git a/app/i18n/i18n_en.ts b/app/i18n/i18n_en.ts
@@ -236,7 +236,7 @@ const schema: PrepareSchema<LocalizationSchema, '' | '_plural'> = {
         unusualJettonsGas: 'Gas is higher than usual',
         unusualJettonsGasTitle: 'The fee for sending jettons is {{amount}} TON',
         unusualJettonsGasMessage: 'Jetton transaction fee (Gas) is higher than usual',
-        addressNotActive: 'Not active',
+        addressNotActive: 'This wallet had no outgoing transactions',
         wrongJettonTitle: 'Wrong jetton',
         wrongJettonMessage: 'You are trying to send a jetton that that you don\'t have',
         notEnoughJettonsTitle: 'Not enough jettons',

diff --git a/app/i18n/i18n_ru.ts b/app/i18n/i18n_ru.ts
@@ -220,7 +220,7 @@ const schema: PrepareSchema<LocalizationSchema, '_0' | '_1' | '_2'> = {
         "unusualJettonsGas": "Необычно высокий Gas за отправку жетонов",
         "unusualJettonsGasTitle": "Gas за отправку жетонов {{amount}} TON",
         "unusualJettonsGasMessage": "Комиссия за отправку жетонов выше чем обычно",
-        "addressNotActive": "Не активен",
+        "addressNotActive": "С этого адреса не было исходящих транзакций",
         "wrongJettonTitle": "Неверный жетон",
         "wrongJettonMessage": "Вы пытаетесь отправить жетон, которого у вас нет",
         "notEnoughJettonsTitle": "Недостаточно жетонов",

diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.4</string>
+	<string>2.4.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -42,7 +42,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>222</string>
+	<string>223</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wallet",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "scripts": {
     "start": "expo start --dev-client",
     "android": "expo run:android",