v3.2.8

changelogs/3.2.8.txt

@@ -0,0 +1 @@
+Bug fixes and performance improvements

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "3.2.7",
+  "version": "3.2.8",
   "description": "The most feature-rich web wallet and browser extension for TON – with support of multi-accounts, tokens (jettons), NFT, TON DNS, TON Sites, TON Proxy, and TON Magic.",
   "main": "index.js",
   "scripts": {
@@ -198,7 +198,7 @@
     "@capacitor/keyboard": "6.0.3",
     "@capacitor/push-notifications": "6.0.2",
     "@capacitor/share": "6.0.2",
-    "@capgo/capacitor-native-biometric": "github:mytonwallet-org/capacitor-native-biometric#956d06d1ab78a839f1293921d0bff449edf4ef4d",
+    "@capgo/capacitor-native-biometric": "github:mytonwallet-org/capacitor-native-biometric#15ac58cbf555bd47278d6488cb3c3a069c0ea821",
     "@capgo/native-audio": "6.4.21",
     "@ledgerhq/hw-transport-webhid": "6.29.4",
     "@ledgerhq/hw-transport-webusb": "6.29.4",

public/static-sites/get/index.js

@@ -206,3 +206,15 @@ function setupRateButtons() {
     });
   }
 }
+
+const actions = {
+  redirectToStore,
+  downloadAndroidDirect,
+  redirectToFullList,
+  downloadDefault,
+  download,
+};
+
+for (const action of Object.keys(actions)) {
+  window[action] = actions[action];
+}

public/version.txt

@@ -1 +1 @@
-3.2.7
+3.2.8

src/api/chains/ton/types.ts

@@ -118,8 +118,8 @@ export type ApiFetchEstimateDieselResult = {
   status: DieselStatus;
   /**
    * The amount of the diesel itself. It will be sent together with the actual transfer. None of this will return back
-   * as the excess. Charged on top of the transferred amount. If the diesel is available, guaranteed to be > 0.
-   * The token and stars amounts can't be non-zero simultaneously.
+   * as the excess. Charged on top of the transferred amount. The token and stars amounts can't be non-zero
+   * simultaneously. Warning: the values can be zeros simultaneously, e.g. when the status is 'pending-previous'.
    */
   amount: {
     /** Measured in the transferred token */

src/components/swap/SwapInitial.tsx

@@ -185,13 +185,13 @@ function SwapInitial({
     }
 
     if (swapType === SwapType.OnChain) {
-      if (ourFeePercent) {
-        value = bigintDivideToNumber(value, 1 + (ourFeePercent / 100));
-      }
-
       if (dieselFeeBigint) {
         value -= dieselFeeBigint;
       }
+
+      if (ourFeePercent) {
+        value = bigintDivideToNumber(value, 1 + (ourFeePercent / 100));
+      }
     }
 
     return bigintMax(value, 0n);

src/giveaways/components/App.module.scss

@@ -1,13 +1,7 @@
 @import '../../styles/mixins';
 
 .app {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  max-width: 40rem;
   height: 100%;
-  margin: 0 auto;
   padding: 5rem 1rem 1rem;
 
   font-size: 1.0625rem;

src/giveaways/components/CommonPage.module.scss

@@ -0,0 +1,8 @@
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  max-width: 40rem;
+  margin: 0 auto;
+}

src/giveaways/components/CommonPage.tsx

@@ -3,6 +3,8 @@ import React, { memo } from '../../lib/teact/teact';
 
 import Footer from './Footer';
 
+import styles from './CommonPage.module.scss';
+
 interface OwnProps {
   children: React.ReactNode;
   onConnectClick?: (args?: any) => any;
@@ -15,7 +17,9 @@ function CommonPage({
 }: OwnProps) {
   return (
     <>
-      {children}
+      <div className={styles.container}>
+        {children}
+      </div>
       <Footer
         onConnectClick={onConnectClick}
         wallet={wallet}

src/giveaways/components/Footer.tsx

@@ -5,6 +5,7 @@ import { prettifyAddress } from '../utils/tonConnect';
 
 import Button from '../../components/ui/Button';
 
+import pageStyles from './CommonPage.module.scss';
 import styles from './Footer.module.scss';
 
 interface OwnProps {
@@ -28,12 +29,14 @@ function Footer({ onConnectClick, wallet, isGiveawayFinished }: OwnProps) {
           </div>
         )
         : !isGiveawayFinished && (
-          <Button
-            isSimple
-            className={styles.button}
-            onClick={onConnectClick!}
-          >Connect MyTonWallet
-          </Button>
+          <div className={pageStyles.container}>
+            <Button
+              isSimple
+              className={styles.button}
+              onClick={onConnectClick!}
+            >Connect MyTonWallet
+            </Button>
+          </div>
         )}
     </div>
   );

src/giveaways/pages/GiveawayInfoPage.tsx

@@ -30,7 +30,7 @@ function GiveawayInfoPage({
   function renderAwaitingPageContent() {
     return (
       <>
-        <ImageSection status={ImageSectionStatus.AwaitingResults} />
+        <ImageSection key={ImageSectionStatus.AwaitingResults} status={ImageSectionStatus.AwaitingResults} />
         <div className={titleStyles.title}>You are all set!</div>
         <div className={styles.giveawayInfoText}>Please wait for the results. Good luck!</div>
         <GiveawayInfo giveaway={giveaway} />
@@ -45,7 +45,7 @@ function GiveawayInfoPage({
 
     return (
       <>
-        <ImageSection status={ImageSectionStatus.Paid} />
+        <ImageSection key={ImageSectionStatus.Paid} status={ImageSectionStatus.Paid} />
         <div className={titleStyles.title}>Congratulations!</div>
         <div className={styles.giveawayInfoText}>
           <div>Your Reward</div>
@@ -78,7 +78,7 @@ function GiveawayInfoPage({
 
     return (
       <>
-        <ImageSection status={ImageSectionStatus.Lost} />
+        <ImageSection key={ImageSectionStatus.Lost} status={ImageSectionStatus.Lost} />
         <div className={titleStyles.title}>Giveaway Finished</div>
         <div className={styles.giveawayInfoText}>Unfortunately, you did not receive a<br />reward in it.</div>
       </>

src/global/actions/api/auth.ts

@@ -974,6 +974,7 @@ addActionHandler('enableNativeBiometrics', async (global, actions, { password })
     const isVerified = await NativeBiometric.verifyIdentity({
       title: APP_NAME,
       subtitle: '',
+      maxAttempts: 1,
     })
       .then(() => true)
       .catch(() => false);

src/util/authApi/index.ts

@@ -72,6 +72,7 @@ async function getPassword(config: AuthConfig) {
         title: APP_NAME,
         subtitle: '',
         isWeakAuthenticatorAllowed: true,
+        maxAttempts: 1,
       })
         .then(() => true)
         .catch(() => false);

src/util/fee/transferFee.ts

@@ -132,32 +132,32 @@ function explainGaslessTransferFee({ diesel }: ApiFeeWithDiesel) {
   // Cover as much displayed real fee as possible with diesel, because in the excess it will return as the native token.
   const dieselRealFee = bigintMin(dieselAmount, realFeeInDiesel);
   // Cover the remaining real fee with the native token.
-  const nativeRealFee = convertFee(realFeeInDiesel - dieselRealFee, dieselAmount, diesel.nativeAmount);
+  const nativeRealFee = bigintMax(0n, diesel.realFee - diesel.nativeAmount);
 
   return {
     isGasless: true,
     canTransferFullBalance: false,
     fullFee: {
       precision: 'lessThan',
       terms: {
-        native: diesel.remainingFee,
         token: diesel.amount.token,
         stars: diesel.amount.stars,
+        native: diesel.remainingFee,
       },
     },
     realFee: {
       precision: 'approximate',
       terms: {
-        native: nativeRealFee,
         [dieselKey]: dieselRealFee,
+        native: nativeRealFee,
       },
     },
   } satisfies ExplainedTransferFee;
 }
 
 /**
  * `exampleFromAmount` and `exampleToAmount` define the exchange rate used to convert `amount`.
- * `exampleFromAmount` is defined in the same currency as `amount`.
+ * `exampleFromAmount` is defined in the same currency as `amount`. Mustn't be 0.
  * `exampleToAmount` is defined in the currency you want to get.
  */
 function convertFee(