Merge branch 'develop' into release/v2.1.15

tonwhales · Sep 23, 2024 · 7a8aa83 · 7a8aa83
2 parents c9b5ebe + 675d19f
commit 7a8aa83
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/app/components/Item.tsx b/app/components/Item.tsx
@@ -43,7 +43,8 @@ export const ItemSwitch = memo((props: {
     onChange: (value: boolean) => void,
     leftIcon?: ImageSourcePropType,
     leftIconComponent?: any,
-    titleStyle?: StyleProp<TextStyle>
+    titleStyle?: StyleProp<TextStyle>,
+    style?: StyleProp<TextStyle>,
     disabled?: boolean,
 }) => {
     const theme = useTheme();
@@ -61,6 +62,7 @@ export const ItemSwitch = memo((props: {
                     minHeight: 72
                 },
                 Platform.select({ android: { opacity: props.disabled ? 0.8 : 1 } }),
+                props.style
             ]}
             disabled={props.disabled}
         >

diff --git a/app/fragments/secure/components/TransferSingle.tsx b/app/fragments/secure/components/TransferSingle.tsx
@@ -478,6 +478,7 @@ export const TransferSingle = memo((props: ConfirmLoadedPropsSingle) => {
             contact={contact}
             failed={failed}
             isGasless={fees.type === 'gasless' && fees.params.ok}
+            onSetUseGasless={onSetUseGasless}
         />
     );
 });
diff --git a/app/fragments/secure/components/TransferSingleView.tsx b/app/fragments/secure/components/TransferSingleView.tsx
@@ -33,6 +33,7 @@ import { ThemeType } from "../../../engine/state/theme";
 import { ForcedAvatar, ForcedAvatarType } from "../../../components/avatar/ForcedAvatar";
 import { HoldersOp, HoldersOpView } from "../../../components/transfer/HoldersOpView";
 import { TransferEstimate } from "../TransferFragment";
+import { ItemSwitch } from "../../../components/Item";
 
 import WithStateInit from '@assets/ic_sign_contract.svg';
 import IcAlert from '@assets/ic-alert.svg';
@@ -109,7 +110,8 @@ export const TransferSingleView = memo(({
     isLedger,
     contact,
     failed,
-    isGasless
+    isGasless,
+    onSetUseGasless
 }: {
     operation: StoredOperation,
     order: Order | LedgerOrder,
@@ -135,7 +137,8 @@ export const TransferSingleView = memo(({
     isLedger?: boolean,
     contact?: AddressContact | null,
     failed: boolean,
-    isGasless?: boolean
+    isGasless?: boolean,
+    onSetUseGasless?: (useGasless: boolean) => void
 }) => {
     const toaster = useToaster();
     const navigation = useTypedNavigation();
@@ -628,7 +631,15 @@ export const TransferSingleView = memo(({
                                             </Text>
                                         </View>
                                     </View>
-
+                                    {!!onSetUseGasless && (
+                                        <ItemSwitch
+                                            title={t('transfer.gaslessTransferSwitch', { symbol: jetton?.symbol })}
+                                            value={isGasless ?? false}
+                                            onChange={onSetUseGasless}
+                                            style={{ padding: 0, minHeight: 0, marginTop: 16 }}
+                                            titleStyle={[{ color: theme.textSecondary }, Typography.regular15_20]}
+                                        />
+                                    )}
                                     {(amount > toNano('0.2') && !isGasless) && (
                                         <Pressable
                                             onPress={jettonsGasAlert}

diff --git a/app/i18n/i18n_en.ts b/app/i18n/i18n_en.ts
@@ -233,7 +233,8 @@ const schema: PrepareSchema<LocalizationSchema, '' | '_plural'> = {
         notEnoughJettonsTitle: 'Not enough jettons',
         notEnoughJettonsMessage: 'You are trying to send more jettons than you have',
         aboutFees: 'About fees',
-        aboutFeesDescription: 'The fees for transactions on the blockchain depend on several factors, such as network congestion, transaction size, gas price, and blockchain configuration parameters. The higher the demand for transaction processing on the blockchain or the larger the transaction size (message/comment), the higher the fees will be.'
+        aboutFeesDescription: 'The fees for transactions on the blockchain depend on several factors, such as network congestion, transaction size, gas price, and blockchain configuration parameters. The higher the demand for transaction processing on the blockchain or the larger the transaction size (message/comment), the higher the fees will be.',
+        gaslessTransferSwitch: 'Pay gas fee in {{symbol}}'
     },
     auth: {
         phoneVerify: 'Verify phone',

diff --git a/app/i18n/i18n_ru.ts b/app/i18n/i18n_ru.ts
@@ -217,7 +217,8 @@ const schema: PrepareSchema<LocalizationSchema, '_0' | '_1' | '_2'> = {
         "notEnoughJettonsTitle": "Недостаточно жетонов",
         "notEnoughJettonsMessage": "У вас недостаточно жетонов для отправки",
         "aboutFees": "О комиссиях",
-        "aboutFeesDescription": "Комиссии за транзакции в блокчейне зависят от нескольких факторов: загруженности сети, размера транзакции, цены газа и конфигурационных параметров блокчейна. Чем больше размер транзакции (сообщение/комментарий транзакции) или выше спрос на обработку, тем выше будут комиссии."
+        "aboutFeesDescription": "Комиссии за транзакции в блокчейне зависят от нескольких факторов: загруженности сети, размера транзакции, цены газа и конфигурационных параметров блокчейна. Чем больше размер транзакции (сообщение/комментарий транзакции) или выше спрос на обработку, тем выше будут комиссии.",
+        "gaslessTransferSwitch": "Оплатить комиссию в {{symbol}}"
     },
     "auth": {
         "phoneNumber": "Номер телефона",

diff --git a/app/i18n/schema.ts b/app/i18n/schema.ts
@@ -236,6 +236,7 @@ export type LocalizationSchema = {
         notEnoughJettonsMessage: string,
         aboutFees: string,
         aboutFeesDescription: string,
+        gaslessTransferSwitch: string
     },
     auth: {
         phoneVerify: string,