diff --git a/changelogs/3.2.8.txt b/changelogs/3.2.8.txt new file mode 100644 index 00000000..619f4cd5 --- /dev/null +++ b/changelogs/3.2.8.txt @@ -0,0 +1 @@ +Bug fixes and performance improvements diff --git a/package-lock.json b/package-lock.json index d97cf14a..dfd013c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mytonwallet", - "version": "3.2.7", + "version": "3.2.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mytonwallet", - "version": "3.2.7", + "version": "3.2.8", "license": "GPL-3.0-or-later", "dependencies": { "@awesome-cordova-plugins/core": "6.9.0", @@ -24,7 +24,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", @@ -3352,8 +3352,8 @@ }, "node_modules/@capgo/capacitor-native-biometric": { "version": "6.0.0", - "resolved": "git+ssh://git@github.com/mytonwallet-org/capacitor-native-biometric.git#956d06d1ab78a839f1293921d0bff449edf4ef4d", - "integrity": "sha512-Y6Kuu/QK7nKmnOD7MR+88dTpu/OWJzIDft7+ml/RYNWcRrFkwzGhehxW7ewMlpkw3Dv8NowiC5IHu+2qrb1DBg==", + "resolved": "git+ssh://git@github.com/mytonwallet-org/capacitor-native-biometric.git#15ac58cbf555bd47278d6488cb3c3a069c0ea821", + "integrity": "sha512-1FxhgCjbC2dC/kh4tfg8XdAQvLwYMu0ci1i7SueTlkH/rDTGSLF7+kwELWNuYN6fx6osyUChmHnpuVmRjBvpXQ==", "license": "MIT", "peerDependencies": { "@capacitor/core": "^6.0.0" diff --git a/package.json b/package.json index 2439fa53..3845f85b 100644 --- a/package.json +++ b/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", diff --git a/public/static-sites/get/index.js b/public/static-sites/get/index.js index 1cf5d3e2..5a08e4e8 100644 --- a/public/static-sites/get/index.js +++ b/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]; +} diff --git a/public/version.txt b/public/version.txt index 406ebcbd..f092941a 100644 --- a/public/version.txt +++ b/public/version.txt @@ -1 +1 @@ -3.2.7 +3.2.8 diff --git a/src/api/chains/ton/types.ts b/src/api/chains/ton/types.ts index 532b68e9..6b4a70d2 100644 --- a/src/api/chains/ton/types.ts +++ b/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 */ diff --git a/src/components/swap/SwapInitial.tsx b/src/components/swap/SwapInitial.tsx index c6457a9b..9550f530 100644 --- a/src/components/swap/SwapInitial.tsx +++ b/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); diff --git a/src/giveaways/components/App.module.scss b/src/giveaways/components/App.module.scss index 23d7011d..78233046 100644 --- a/src/giveaways/components/App.module.scss +++ b/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; diff --git a/src/giveaways/components/CommonPage.module.scss b/src/giveaways/components/CommonPage.module.scss new file mode 100644 index 00000000..87fc1652 --- /dev/null +++ b/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; +} diff --git a/src/giveaways/components/CommonPage.tsx b/src/giveaways/components/CommonPage.tsx index e3e5764d..96725715 100644 --- a/src/giveaways/components/CommonPage.tsx +++ b/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} +
+ {children} +