Merge pull request #708 from tonwhales/release/v2.0.0

Release/v2.0.0
tonwhales · Jan 10, 2024 · 3c37e99 · 3c37e99
2 parents 91d1bf3 + 3a96a44
commit 3c37e99
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/VERSION_CODE b/VERSION_CODE
@@ -1 +1 @@
-183
+184
diff --git a/app/components/ItemButton.tsx b/app/components/ItemButton.tsx
@@ -47,6 +47,7 @@ export const ItemButton = memo((props: {
                         )}
                         <Text
                             style={{
+                                flexGrow: 1, flexShrink: 1,
                                 fontSize: 17, lineHeight: 24,
                                 fontWeight: props.dangerZone ? '500' : '600',
                                 textAlignVertical: 'center',

diff --git a/app/fragments/secure/SimpleTransferFragment.tsx b/app/fragments/secure/SimpleTransferFragment.tsx
@@ -833,7 +833,10 @@ export const SimpleTransferFragment = fragment(() => {
                                 style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}
                                 onPress={() => navigation.navigate(
                                     'Assets',
-                                    { callback: onAssetSelected, selectedJetton: jettonState?.master }
+                                    {
+                                        callback: onAssetSelected,
+                                        selectedJetton: jettonState ? Address.parse(jettonState.master.address) : undefined
+                                    }
                                 )}
                             >
                                 <View style={{

diff --git a/app/fragments/wallet/AssetsFragment.tsx b/app/fragments/wallet/AssetsFragment.tsx
@@ -14,11 +14,11 @@ import { useJettons, useNetwork, useSelectedAccount, useTheme } from "../../engi
 import { Address } from "@ton/core";
 import { useLedgerTransport } from "../ledger/components/TransportContext";
 import { Jetton } from "../../engine/types";
-
-import TonIcon from '@assets/ic-ton-acc.svg';
 import { StatusBar } from "expo-status-bar";
 import { Platform } from "react-native";
 
+import TonIcon from '@assets/ic-ton-acc.svg';
+
 export const AssetsFragment = fragment(() => {
     const safeArea = useSafeAreaInsets();
     const navigation = useTypedNavigation();
@@ -156,7 +156,7 @@ export const AssetsFragment = fragment(() => {
                     />
                     {(isLedgerScreen ? ledgerJettons : visibleList).map((j) => {
                         const verified = KnownJettonMasters(network.isTestnet)[j.master.toString()];
-                        const selected = selectedJetton && j.master.equals(selectedJetton);
+                        const selected = !!selectedJetton && j.master.equals(selectedJetton);
                         return (
                             <SelectableButton
                                 key={'jt' + j.wallet.toString()}

diff --git a/app/fragments/wallet/WalletSettingsFragment.tsx b/app/fragments/wallet/WalletSettingsFragment.tsx
@@ -14,6 +14,7 @@ import { useNetwork, useSelectedAccount, useTheme } from "../../engine/hooks";
 import { useWalletSettings } from "../../engine/hooks/appstate/useWalletSettings";
 import { StatusBar } from "expo-status-bar";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useKeyboard } from "@react-native-community/hooks";
 
 export const WalletSettingsFragment = fragment(() => {
     const theme = useTheme();
@@ -24,6 +25,7 @@ export const WalletSettingsFragment = fragment(() => {
     const selected = useSelectedAccount();
     const address = selected!.address;
     const safeArea = useSafeAreaInsets();
+    const keyboard = useKeyboard();
 
     const [walletSettings, setSettings] = useWalletSettings(address);
 
@@ -165,7 +167,11 @@ export const WalletSettingsFragment = fragment(() => {
                                     {
                                         message: t('common.walletAddress') + ' ' + t('common.copied').toLowerCase(),
                                         type: 'default',
-                                        duration: ToastDuration.SHORT
+                                        duration: ToastDuration.SHORT,
+                                        marginBottom: Platform.select({
+                                            ios: keyboard.keyboardShown ? keyboard.keyboardHeight + 16 : 0,
+                                            android: keyboard.keyboardShown ? keyboard.keyboardHeight : 0
+                                        })
                                     }
                                 );
                             }}

diff --git a/app/i18n/i18n_en.ts b/app/i18n/i18n_en.ts
@@ -439,7 +439,7 @@ const schema: PrepareSchema<LocalizationSchema, '' | '_plural'> = {
                 cooldownInactive: 'Inactive',
                 cooldownDescription: 'All transactions take effect instantly during this period',
                 cooldownAlert: 'At the beginning of each staking cycle, the Simplified Period is active. During this period you don\'t have to wait for the cycle to end in order to withdraw or top up - it happens instantly, and you don\'t have to send a second transaction to withdraw, which halves the withdrawal fee. You can transfer funds from one pool to another without losing cycle profits if the Simplified Period is active in both pools',
-                lockedAlert: 'While the staking sycle is in progress withdrawals and deposits are pending. All transactions take effect once the cycle ends'
+                lockedAlert: 'While the staking cycle is in progress withdrawals and deposits are pending. All transactions take effect once the cycle ends'
             },
             minAmountWarning: 'Minimum amount is {{minAmount}} TON',
             tryAgainLater: 'Please, try again later',