battery hotfix

packages/@core-js/src/TonAPI/HttpClient.ts

@@ -10,7 +10,7 @@ type CancelToken = Symbol | string | number;
 
 export type HttpClientOptions = {
   baseUrl: string | (() => string);
-  token?: string | (() => string);
+  baseHeaders?: { [key: string]: string } | (() => { [key: string]: string });
 };
 
 export class HttpClient {
@@ -143,18 +143,18 @@ export class HttpClient {
       typeof this.options.baseUrl === 'function'
         ? this.options.baseUrl()
         : this.options.baseUrl;
-    const token =
-      typeof this.options.token === 'function'
-        ? this.options.token()
-        : this.options.token;
+    const baseHeaders =
+      typeof this.options.baseHeaders === 'function'
+        ? this.options.baseHeaders()
+        : this.options.baseHeaders;
 
     const response = await this.customFetch(
       `${baseUrl}${path}${queryString ? `?${queryString}` : ''}`,
       {
         method,
         headers: {
           'Content-Type': 'application/json',
-          Authorization: `Bearer ${token}`,
+          ...(baseHeaders ?? {}),
           ...(headers ?? {}),
         },
         signal: cancelToken ? this.createAbortSignal(cancelToken) : null,

packages/mobile/android/app/build.gradle

@@ -92,7 +92,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 433
-        versionName "3.6.1"
+        versionName "3.6.2"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
     }

packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj

@@ -1294,7 +1294,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.1;
+				MARKETING_VERSION = 3.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1328,7 +1328,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.1;
+				MARKETING_VERSION = 3.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

packages/mobile/src/core/AccessConfirmation/AccessConfirmation.tsx

@@ -160,7 +160,7 @@ export const AccessConfirmation: FC = () => {
         }
       }
     },
-    [dispatch, isBiometryFailed, isUnlock, triggerError, wallet],
+    [dispatch, isBiometryFailed, isUnlock, obtainTonProof, triggerError, wallet],
   );
 
   const handleBiometry = useCallback(() => {
@@ -175,6 +175,9 @@ export const AccessConfirmation: FC = () => {
         setTimeout(async () => {
           // Lock screen
           if (isUnlock) {
+            const keyPair = await (unlockedVault as any).getKeyPair();
+            // createTronAddress(privateKey);
+            obtainTonProof(keyPair);
             dispatch(mainActions.setUnlocked(true));
           } else {
             goBack();
@@ -187,7 +190,7 @@ export const AccessConfirmation: FC = () => {
         setBiometryFailed(true);
         triggerError();
       });
-  }, [dispatch, isUnlock, triggerError, wallet]);
+  }, [dispatch, isUnlock, obtainTonProof, triggerError, wallet]);
 
   useEffect(() => {
     if (params.withoutBiometryOnOpen) {

packages/mobile/src/core/ModalContainer/NFTOperations/NFTOperations.ts

@@ -14,7 +14,6 @@ import { t } from '@tonkeeper/shared/i18n';
 import { Ton } from '$libs/Ton';
 import { getServerConfig } from '$shared/constants';
 import { Configuration, NFTApi } from '@tonkeeper/core/src/legacy';
-import { sendBocWithBattery } from '@tonkeeper/shared/utils/blockchain';
 import { tonapi } from '@tonkeeper/shared/tonkeeper';
 
 const { NftItem } = TonWeb.token.nft;
@@ -172,7 +171,7 @@ export class NFTOperations {
         const queryMsg = await methods.getQuery();
         const boc = Base64.encodeBytes(await queryMsg.toBoc(false));
 
-        await sendBocWithBattery(boc);
+        await tonapi.blockchain.sendBlockchainMessage({ boc }, { format: 'text' });
 
         onDone?.(boc);
       },

packages/mobile/src/core/Settings/Settings.tsx

@@ -87,7 +87,7 @@ export const Settings: FC = () => {
   const shouldShowTokensButton = useShouldShowTokensButton();
   const showNotifications = useNotificationsStore(shouldShowNotifications);
 
-  const isBatteryVisible = !config.get('disable_battery');
+  const isBatteryVisible = !!wallet && !config.get('disable_battery');
 
   const searchEngine = useBrowserStore((state) => state.searchEngine);
   const setSearchEngine = useBrowserStore((state) => state.actions.setSearchEngine);

packages/shared/components/RefillBattery/RefillBattery.tsx

@@ -24,6 +24,9 @@ export const RefillBattery = memo(() => {
   const { balance } = useBatteryBalance();
   const batteryState = getBatteryState(balance ?? '0');
   const iconName = iconNames[batteryState];
+  const availableNumOfTransactionsCount = calculateAvailableNumOfTransactions(
+    balance ?? '0',
+  );
 
   const isInAppPurchasesDisabled = config.get('disable_battery_iap_module');
 
@@ -39,10 +42,14 @@ export const RefillBattery = memo(() => {
         <Text textAlign="center" type="body2" color="textSecondary">
           {t(
             `battery.description.${
-              batteryState === BatteryState.Empty ? 'empty' : 'other'
+              batteryState === BatteryState.Empty
+                ? 'empty'
+                : availableNumOfTransactionsCount
+                ? 'other'
+                : 'less_10'
             }`,
             {
-              cnt: calculateAvailableNumOfTransactions(balance ?? '0'),
+              cnt: availableNumOfTransactionsCount,
             },
           )}
         </Text>
@@ -52,11 +59,9 @@ export const RefillBattery = memo(() => {
         {!isInAppPurchasesDisabled ? <RefillBatteryIAP /> : null}
         <RechargeByPromoButton />
         <Spacer y={16} />
-        {!isInAppPurchasesDisabled && (
-          <Text type="label2" textAlign="center" color="textTertiary">
-            {t('battery.packages.disclaimer')}
-          </Text>
-        )}
+        <Text type="label2" textAlign="center" color="textTertiary">
+          {t('battery.packages.disclaimer')}
+        </Text>
       </View>
     </>
   );

packages/shared/i18n/locales/tonkeeper/en.json

@@ -136,7 +136,8 @@
     },
     "description": {
       "empty": "Send tokens and NFTs, pay for staking actions with empty main balance.",
-      "other": "You have enough charge battery for more than %{cnt} transactions."
+      "other": "You have enough charge battery for more than %{cnt} transactions.",
+      "less_10": "You have enough charge battery for less than 10 transactions."
     },
     "promocode": {
       "button": "Recharge by Promo Code",
@@ -148,9 +149,9 @@
     "packages": {
       "title": "{{cnt}} transactions for {{price}}",
       "subtitle": {
-        "large": "Large gas fees pack",
-        "medium": "Medium gas fees pack",
-        "small": "Small gas fees pack"
+        "large": "Large pack",
+        "medium": "Medium pack",
+        "small": "Small pack"
       },
       "disclaimer": "This is approximate transactions number. Some your transactions may cost more.",
       "buy": "Buy",

packages/shared/i18n/locales/tonkeeper/ru-RU.json

@@ -981,6 +981,7 @@
       },
       "comment" : "Комментарий",
       "insufficientFunds" : {
+        "rechargeBattery": "Зарядить батарейку",
         "rechargeWallet" : "Пополнить кошелёк",
         "stakingFee" : {
           "few" : "Для совершения транзакции необходимо %{count} TON. Предполагаемая комиссия в размере %{fee} TON будет удержана, остаток будет возвращён.",
@@ -1072,7 +1073,8 @@
     },
     "description": {
       "empty": "Отправляйте токены и NFT, взаимодействуйте со стейкингом при нулевом балансе кошелька.",
-      "other": "У вас достаточно заряда для более чем {{cnt}} транзакций."
+      "other": "У вас достаточно заряда для более чем {{cnt}} транзакций.",
+      "less_10": "У вас достаточно заряда для менее чем 10 транзакций."
     },
     "promocode": {
       "button": "Зарядить с помощью промокода",

packages/shared/tonkeeper.ts

@@ -8,14 +8,17 @@ import { queryClient } from './queryClient';
 import { TonAPI } from '@tonkeeper/core';
 import { config } from './config';
 import { BatteryAPI } from '@tonkeeper/core/src/BatteryAPI';
+import { i18n } from './i18n';
 
 export const sse = new AppServerSentEvents({
   baseUrl: () => config.get('tonapiIOEndpoint'),
   token: () => config.get('tonApiV2Key'),
 });
 
 export const tonapi = new TonAPI({
-  token: () => config.get('tonApiV2Key'),
+  baseHeaders: () => ({
+    Authorization: `Bearer ${config.get('tonApiV2Key')}`,
+  }),
   baseUrl: () => {
     if (tk.wallet?.identity.network === WalletNetwork.testnet) {
       return config.get('tonapiTestnetHost');
@@ -43,6 +46,9 @@ export const batteryapi = new BatteryAPI({
 
     return config.get('batteryHost');
   },
+  baseHeaders: {
+    'Accept-Language': i18n.locale,
+  },
 });
 
 export const storage = new AppStorage();

packages/shared/utils/battery.ts

@@ -47,5 +47,5 @@ export function calculateAvailableNumOfTransactions(batteryBalance: string) {
     .div(10)
     .decimalPlaces(0, BigNumber.ROUND_DOWN)
     .times(10)
-    .toString();
+    .toNumber();
 }

packages/uikit/src/components/Input.tsx

@@ -231,11 +231,17 @@ export const Input = forwardRef<InputRef, InputProps>((props, ref) => {
   const handlePastePress = useCallback(async () => {
     try {
       const str = await Clipboard.getString();
+      if (onChangeText) {
+        onChangeText(str);
+      }
       setInputValue(str);
     } catch {}
   }, []);
 
   const handlePressClear = useCallback(() => {
+    if (onChangeText) {
+      onChangeText('');
+    }
     setInputValue('');
   }, []);