fix(mobile): Show locked jettons with zero balances (#783)

* update TonAPI JettonBalance type * fix(mobile): Show in app locked jettons with zero balance * Remove unnecessary logic * Fix crash * fix(mobile): Dot color
tonkeeper · Apr 9, 2024 · f95612a · f95612a
1 parent b2b52ec
commit f95612a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/packages/@core-js/src/TonAPI/TonAPIGenerated.ts b/packages/@core-js/src/TonAPI/TonAPIGenerated.ts
@@ -1258,6 +1258,15 @@ export interface JettonBalance {
   price?: TokenRates;
   wallet_address: AccountAddress;
   jetton: JettonPreview;
+  lock?: {
+    /** @example 597968399 */
+    amount: string;
+    /**
+     * @format int64
+     * @example 1678223064
+     */
+    till: number;
+  };
 }
 
 export interface JettonsBalances {

diff --git a/packages/mobile/src/core/Jetton/Jetton.tsx b/packages/mobile/src/core/Jetton/Jetton.tsx
@@ -109,8 +109,9 @@ export const Jetton: React.FC<JettonProps> = ({ route }) => {
                     currency: jetton.metadata.symbol,
                     currencySeparator: 'wide',
                   })}
-                   ·
-                  {' '}
+                  <Text variant="body2" color="textTertiary">
+                    {' '}·{' '}
+                  </Text>
                   {lockedJettonPrice.formatted.totalFiat}
                 </Text>
                 <Text variant="body2" color="textTertiary">

diff --git a/packages/mobile/src/core/Send/steps/AmountStep/CoinDropdown/CoinDropdown.tsx b/packages/mobile/src/core/Send/steps/AmountStep/CoinDropdown/CoinDropdown.tsx
@@ -56,7 +56,7 @@ const CoinDropdownComponent: FC<Props> = (props) => {
 
   const balances = useBalancesState();
 
-  const { enabled: jettons } = useJettonBalances(false, true);
+  const { enabled: jettons } = useJettonBalances(true);
   const inscriptions = useTonInscriptions();
   const { format } = useHideableFormatter();
 

diff --git a/packages/mobile/src/hooks/useJettonBalances.ts b/packages/mobile/src/hooks/useJettonBalances.ts
@@ -9,10 +9,7 @@ export interface IBalances {
   enabled: JettonBalanceModel[];
   disabled: JettonBalanceModel[];
 }
-export const useJettonBalances = (
-  withZeroBalances?: boolean,
-  showStakingJettons = false,
-) => {
+export const useJettonBalances = (showStakingJettons = false) => {
   const { jettonBalances } = useJettons();
   const approvalStatuses = useTokenApproval();
   const stakingJettons = useStakingState(getStakingJettons);
@@ -28,10 +25,6 @@ export const useJettonBalances = (
       const approvalStatus = approvalStatuses.tokens[jettonAddress];
       const isBlacklisted = jetton.verification === JettonVerification.BLACKLIST;
 
-      if (!withZeroBalances && jetton.balance === '0') {
-        return;
-      }
-
       if (
         !showStakingJettons &&
         stakingJettons.includes(Address.parse(jetton.jettonAddress).toRaw())
@@ -50,13 +43,7 @@ export const useJettonBalances = (
     });
 
     return balances;
-  }, [
-    approvalStatuses.tokens,
-    jettonBalances,
-    showStakingJettons,
-    stakingJettons,
-    withZeroBalances,
-  ]);
+  }, [approvalStatuses.tokens, jettonBalances, showStakingJettons, stakingJettons]);
 
   return jettons;
 };
diff --git a/packages/mobile/src/wallet/managers/JettonsManager.ts b/packages/mobile/src/wallet/managers/JettonsManager.ts
@@ -80,7 +80,7 @@ export class JettonsManager {
 
       const jettonBalances = accountJettons.balances
         .filter((item) => {
-          return item.balance !== '0';
+          return item.balance !== '0' || (item.lock && item.lock.amount !== '0');
         })
         .sort((a, b) => {
           // Unverified or blacklisted tokens have to be at the end of array

diff --git a/packages/mobile/src/wallet/models/JettonBalanceModel/JettonBalanceModel.ts b/packages/mobile/src/wallet/models/JettonBalanceModel/JettonBalanceModel.ts
@@ -16,7 +16,7 @@ export class JettonBalanceModel {
       jettonBalance.balance,
       jettonBalance.jetton.decimals,
     );
-    // @ts-ignore will be implemented in API later
+
     this.lock = jettonBalance.lock && {
       amount: AmountFormatter.fromNanoStatic(
         jettonBalance.lock.amount,