Extend heightInfo for WalletConnect (#2894)

* extend heightData

* name change

Author: matt-o-how

packages/api-react/src/services/wallet.ts

@@ -553,7 +553,6 @@ export const walletApi = apiWithTag.injectEndpoints({
     getTimestampForHeight: query(build, WalletService, 'getTimestampForHeight'),
 
     getHeightInfo: query(build, WalletService, 'getHeightInfo', {
-      transformResponse: (response) => response.height,
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, api, [
         {
           command: 'onSyncChanged',

packages/api/src/services/WalletService.ts

@@ -211,7 +211,11 @@ export default class Wallet extends Service {
   }
 
   async getHeightInfo() {
-    return this.command<{ height: number }>('get_height_info');
+    return this.command<{
+      height: number;
+      isTransactionBlock: boolean | null;
+      prevTransactionBlockHeight: number | null;
+    }>('get_height_info');
   }
 
   async getNetworkInfo() {

packages/core/src/screens/SelectKey/WalletStatusHeight.tsx

@@ -4,12 +4,13 @@ import React from 'react';
 import FormatLargeNumber from '../../components/FormatLargeNumber';
 
 export default function WalletStatusHeight() {
-  const { data: height, isLoading } = useGetHeightInfoQuery(
+  const { data: heightData, isLoading } = useGetHeightInfoQuery(
     {},
     {
       pollingInterval: 10_000,
     },
   );
+  const height = heightData?.height;
 
   if (isLoading) {
     return null;

packages/gui/src/components/offers/OfferManager.tsx

@@ -105,9 +105,10 @@ function OfferList(props: OfferListProps) {
 
   const isWalletSynced = useIsWalletSynced();
 
-  const { data: height, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
+  const { data: heightData, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
     pollingInterval: 3000,
   });
+  const height = heightData?.height;
   const { data: lastBlockTimeStampData, isLoading: isGetTimestampForHeightLoading } = useGetTimestampForHeightQuery(
     { height: height || 0 },
     { skip: !height },

packages/gui/src/components/offers2/CreateOfferBuilder.tsx

@@ -76,9 +76,10 @@ export default function CreateOfferBuilder(props: CreateOfferBuilderProps) {
 
   const [suppressShareOnCreate] = useSuppressShareOnCreate();
 
-  const { data: height, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
+  const { data: heightData, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
     pollingInterval: 3000,
   });
+  const height = heightData?.height;
   const { data: lastBlockTimeStampData, isLoading: isGetTimestampForHeightLoading } = useGetTimestampForHeightQuery(
     { height: height || 0 },
     { skip: !height },

packages/gui/src/components/offers2/OfferBuilderViewer.tsx

@@ -114,9 +114,10 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) {
   let expirationTime = null;
   let isExpired = false;
 
-  const { data: height, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
+  const { data: heightData, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
     pollingInterval: 3000,
   });
+  const height = heightData?.height;
   const { data: lastBlockTimeStampData, isLoading: isGetTimestampForHeightLoading } = useGetTimestampForHeightQuery(
     { height: height || 0 },
     { skip: !height },

packages/wallets/src/components/WalletHistoryClawbackChip.tsx

@@ -19,9 +19,10 @@ export default function WalletHistoryClawbackChip(props: Props) {
   const { data: autoClaimData, isLoading: isGetAutoClaimLoading } = useGetAutoClaimQuery();
   const isAutoClaimEnabled = !isGetAutoClaimLoading && autoClaimData?.enabled;
 
-  const { data: height, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
+  const { data: heightData, isLoading: isGetHeightInfoLoading } = useGetHeightInfoQuery(undefined, {
     pollingInterval: 3000,
   });
+  const height = heightData?.height;
 
   const { data: lastBlockTimeStampData, isLoading: isGetTimestampForHeightLoading } = useGetTimestampForHeightQuery({
     height: height || 0,

packages/wallets/src/components/WalletStatusHeight.tsx

@@ -3,12 +3,13 @@ import { FormatLargeNumber } from '@chia-network/core';
 import React from 'react';
 
 export default function WalletStatusHeight() {
-  const { data: height, isLoading } = useGetHeightInfoQuery(
+  const { data: heightData, isLoading } = useGetHeightInfoQuery(
     {},
     {
       pollingInterval: 10_000,
     },
   );
+  const height = heightData?.height;
 
   if (isLoading) {
     return null;