fix(mobile): Inscriptions fixes (#667)

* fix(mobile): Add missing translation * fix(mobile): Disable comment encryption by default * fix(mobile): Parse comment param from inscription transfer deeplink * fix(mobile): Scan inscription-transfer deeplink QR at send screen correctly * fix(mobile): Dismiss Keyboard before going to Confirm step
tonkeeper · Jan 12, 2024 · a797ab1 · a797ab1
1 parent 3432d24
commit a797ab1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/packages/mobile/src/core/NFTSend/NFTSend.tsx b/packages/mobile/src/core/NFTSend/NFTSend.tsx
@@ -28,6 +28,7 @@ import { Toast } from '$store';
 import axios from 'axios';
 import { useWallet } from '$hooks/useWallet';
 import { useUnlockVault } from '$core/ModalContainer/NFTOperations/useUnlockVault';
+import { Keyboard } from 'react-native';
 
 interface Props {
   route: RouteProp<AppStackParamList, AppStackRouteNames.NFTSend>;
@@ -119,6 +120,7 @@ export const NFTSend: FC<Props> = (props) => {
       messages.current = nftTransferMessages;
       setConsequences(response);
 
+      Keyboard.dismiss();
       await delay(100);
 
       stepViewRef.current?.go(NFTSendSteps.CONFIRM);

diff --git a/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx b/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx
@@ -2,7 +2,7 @@ import { useSuggestedAddresses } from '../../hooks/useSuggestedAddresses';
 import { useReanimatedKeyboardHeight } from '$hooks/useKeyboardHeight';
 import { Ton } from '$libs/Ton';
 import { Button, FormItem } from '$uikit';
-import { asyncDebounce, formatInputAmount, parseTonLink } from '$utils';
+import { asyncDebounce, formatInputAmount, isTransferOp, parseTonLink } from '$utils';
 import React, {
   FC,
   memo,
@@ -51,7 +51,7 @@ const AddressStepComponent: FC<AddressStepProps> = (props) => {
     setRecipient,
     changeBlockchain,
     active,
-    enableEncryption = true,
+    enableEncryption = false, // TODO: replace with true here when encryption will be ready
     setRecipientAccountInfo,
     setAmount,
     setComment,
@@ -139,11 +139,7 @@ const AddressStepComponent: FC<AddressStepProps> = (props) => {
           setDnsLoading(false);
         }
 
-        if (
-          link.match &&
-          link.operation === 'transfer' &&
-          Address.isValid(link.address)
-        ) {
+        if (link.match && isTransferOp(link.operation) && Address.isValid(link.address)) {
           if (
             setAmount &&
             link.query.amount &&

diff --git a/packages/mobile/src/core/Send/steps/AddressStep/components/AddressInput/AddressInput.tsx b/packages/mobile/src/core/Send/steps/AddressStep/components/AddressInput/AddressInput.tsx
@@ -3,7 +3,7 @@ import { t } from '@tonkeeper/shared/i18n';
 import { openScanQR } from '$navigation';
 import { WordHintsPopupRef } from '$shared/components/ImportWalletForm/WordHintsPopup';
 import { Icon, Input, Loader, Text } from '$uikit';
-import { isAndroid, ns, parseTonLink } from '$utils';
+import { isAndroid, isTransferOp, ns, parseTonLink } from '$utils';
 import React, {
   FC,
   memo,
@@ -134,8 +134,7 @@ const AddressInputComponent: FC<Props> = (props) => {
   const handleScanQR = useCallback(() => {
     openScanQR(async (code: string) => {
       const link = parseTonLink(code);
-
-      if (link.match && link.operation === 'transfer' && !Address.isValid(link.address)) {
+      if (link.match && isTransferOp(link.operation) && !Address.isValid(link.address)) {
         Toast.fail(t('transfer_deeplink_address_error'));
         return false;
       }

diff --git a/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts b/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts
@@ -270,6 +270,7 @@ export function useDeeplinkingResolvers() {
           currency: inscription.ticker,
           currencyAdditionalParams: { type: inscription.type },
           address,
+          comment,
           withGoBack: resolveParams.withGoBack,
           tokenType: TokenType.Inscription,
           redirectToActivity: resolveParams.redirectToActivity,

diff --git a/packages/mobile/src/utils/parseTonLink.ts b/packages/mobile/src/utils/parseTonLink.ts
@@ -7,6 +7,15 @@ const prefixes = [
   'tonkeeper://',
 ];
 
+export enum TransferOperationType {
+  InscriptionTransfer = 'inscription-transfer',
+  Transfer = 'transfer',
+}
+
+export function isTransferOp(operation: string): operation is TransferOperationType {
+  return (Object.values(TransferOperationType) as string[]).includes(operation);
+}
+
 type ParsedTonLink = {
   match: boolean;
   address: string;

diff --git a/packages/shared/i18n/locales/tonkeeper/en.json b/packages/shared/i18n/locales/tonkeeper/en.json
@@ -227,6 +227,7 @@
   "confirm_sending_submit" : "Confirm and Send",
   "confirm_sending_title" : "Confirm sending",
   "confirmSendModal" : {
+    "refund": "Refund",
     "network_fee" : "Network fee",
     "title" : "Confirm action",
     "to_your_address" : "To your address",

diff --git a/packages/shared/i18n/locales/tonkeeper/ru-RU.json b/packages/shared/i18n/locales/tonkeeper/ru-RU.json
@@ -232,6 +232,7 @@
   "confirm_sending_submit" : "Подтвердить и отправить",
   "confirm_sending_title" : "Перевод",
   "confirmSendModal" : {
+    "refund": "Возврат",
     "network_fee" : "Комиссия сети",
     "title" : "Подтвердить действие",
     "to_your_address" : "На ваш адрес",