From c301bc0c738a05823659602b1747b1acf4871f58 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Wed, 15 May 2024 14:24:23 +0300
Subject: [PATCH] fix(mobile): fix TON position (#854)

* fix(mobile): stop support tonkeeper domain in manifest

* fix(mobile): Move TON to bottom
---
 packages/mobile/src/tonconnect/TonConnect.ts  |  8 +++++++
 .../RefillBattery/RechargeMethods.tsx         | 18 +++++++--------
 .../modals/SelectRechargeMethodModal.tsx      | 22 +++++++++----------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/packages/mobile/src/tonconnect/TonConnect.ts b/packages/mobile/src/tonconnect/TonConnect.ts
index c34ecc890..88cfb7dd8 100644
--- a/packages/mobile/src/tonconnect/TonConnect.ts
+++ b/packages/mobile/src/tonconnect/TonConnect.ts
@@ -41,6 +41,7 @@ import { SendTransactionError } from './SendTransactionError';
 import { tk } from '$wallet';
 import { TonConnectRemoteBridge } from './TonConnectRemoteBridge';
 import { WithWalletIdentifier } from '$wallet/WalletTypes';
+import { getDomainFromURL } from '$utils';
 
 class TonConnectService {
   checkProtocolVersionCapability(protocolVersion: number) {
@@ -112,6 +113,13 @@ class TonConnectService {
 
       const manifest = await this.getManifest(request);
 
+      if (getDomainFromURL(manifest.url) === 'tonkeeper.com') {
+        throw new ConnectEventError(
+          CONNECT_EVENT_ERROR_CODES.BAD_REQUEST_ERROR,
+          'Bad request',
+        );
+      }
+
       try {
         const { address, replyItems, notificationsEnabled, walletIdentifier } =
           await new Promise<TonConnectModalResponse>((resolve, reject) =>
diff --git a/packages/shared/components/RefillBattery/RechargeMethods.tsx b/packages/shared/components/RefillBattery/RechargeMethods.tsx
index 64b6f3ac5..153d6f96f 100644
--- a/packages/shared/components/RefillBattery/RechargeMethods.tsx
+++ b/packages/shared/components/RefillBattery/RechargeMethods.tsx
@@ -65,15 +65,6 @@ export const RechargeMethods = memo(() => {
   return (
     <View>
       <List indent={false}>
-        {hasTonBalance && (
-          <List.Item
-            chevron
-            leftContent={<TonIcon showDiamond />}
-            title={t('battery.other_ways.by_crypto.title', { symbol: 'TON' })}
-            onPress={handleRechargeBattery(false)}
-            subtitle={formatter.format(balances.ton, { currency: 'TON' })}
-          />
-        )}
         {filteredJettonBalances.map((jettonBalance) => (
           <List.Item
             chevron
@@ -91,6 +82,15 @@ export const RechargeMethods = memo(() => {
             })}
           />
         ))}
+        {hasTonBalance && (
+          <List.Item
+            chevron
+            leftContent={<TonIcon showDiamond />}
+            title={t('battery.other_ways.by_crypto.title', { symbol: 'TON' })}
+            onPress={handleRechargeBattery(false)}
+            subtitle={formatter.format(balances.ton, { currency: 'TON' })}
+          />
+        )}
         {hasAnyBalance && (
           <List.Item
             onPress={handleRechargeBattery(true)}
diff --git a/packages/shared/modals/SelectRechargeMethodModal.tsx b/packages/shared/modals/SelectRechargeMethodModal.tsx
index a949d8cb9..f3b8e7bd4 100644
--- a/packages/shared/modals/SelectRechargeMethodModal.tsx
+++ b/packages/shared/modals/SelectRechargeMethodModal.tsx
@@ -46,17 +46,6 @@ export const SelectRechargeMethodModal = memo<SelectRechargeMethodModalParams>(
         <Modal.Header title={t('battery.recharge_by_crypto.tokens')} />
         <Modal.Content safeArea>
           <List>
-            <List.Item
-              leftContent={<TonIcon showDiamond />}
-              title={'TON'}
-              onPress={handleSelectJettonMaster(undefined)}
-              rightContent={
-                !props.selectedJettonMaster && (
-                  <Icon color={'accentBlue'} name={'ic-donemark-outline-28'} />
-                )
-              }
-              subtitle={formatter.format(balances.ton, { currency: 'TON' })}
-            />
             {filteredJettonBalances.map((jettonBalance) => (
               <List.Item
                 key={jettonBalance.jettonAddress}
@@ -76,6 +65,17 @@ export const SelectRechargeMethodModal = memo<SelectRechargeMethodModalParams>(
                 title={jettonBalance.metadata.symbol}
               />
             ))}
+            <List.Item
+              leftContent={<TonIcon showDiamond />}
+              title={'TON'}
+              onPress={handleSelectJettonMaster(undefined)}
+              rightContent={
+                !props.selectedJettonMaster && (
+                  <Icon color={'accentBlue'} name={'ic-donemark-outline-28'} />
+                )
+              }
+              subtitle={formatter.format(balances.ton, { currency: 'TON' })}
+            />
           </List>
         </Modal.Content>
       </Modal>