Removed Push CHain Package and added devnet package

.env.sample

@@ -1,4 +1,5 @@
 VITE_APP_ENV=YOUR_APP_ENV ( local, dev, staging, prod )
 VITE_APP_DYNAMIC_ENV_ID=YOUR_DYNAMIC_ENV_ID
 VITE_APP_BACKEND_URL=http://localhost:3000
-VITE_DEV_MODE="localhost"
+VITE_DEV_MODE="localhost"
+VITE_APP_RPC_URL=YOUR_RPC_URL

package.json

@@ -33,8 +33,7 @@
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@metamask/sdk": "^0.32.0",
     "@noble/hashes": "^1.0.0",
-    "@pushchain/devnet": "^1.0.14",
-    "@pushprotocol/push-chain": "0.1.7",
+    "@pushchain/devnet": "1.0.16",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-switch": "^1.1.0",

src/config/config-dev.ts

@@ -1,10 +1,12 @@
+import { ENV } from "@pushchain/devnet/src/lib/constants";
+
 export const config = {
   /**
    * APP INFO
    */
   APP_NAME: "Push Devnet Wallet",
   NODE_ENV: "dev",
-  APP_ENV: "dev",
+  APP_ENV: ENV.DEVNET,
   /**
    * CHAIN INFO
    */

src/config/config-local.ts

@@ -1,10 +1,12 @@
+import { ENV } from "@pushchain/devnet/src/lib/constants";
+
 export const config = {
   /**
    * APP INFO
    */
   APP_NAME: 'Push Local Wallet',
   NODE_ENV: 'local',
-  APP_ENV: 'local',
+  APP_ENV: ENV.LOCAL,
   /**
    * CHAIN INFO
    */

src/config/config-prod.ts

@@ -1,10 +1,12 @@
+import { ENV } from "@pushchain/devnet/src/lib/constants";
+
 export const config = {
   /**
    * APP INFO
    */
   APP_NAME: 'Push Wallet',
   NODE_ENV: 'prod',
-  APP_ENV: 'prod',
+  APP_ENV: ENV.MAINNET,
 
   /**
    * CHAIN INFO

src/config/config-staging.ts

@@ -1,10 +1,12 @@
+import { ENV } from "@pushchain/devnet/src/lib/constants";
+
 export const config = {
   /**
    * APP INFO
    */
   APP_NAME: 'Push Testnet Wallet',
   NODE_ENV: 'staging',
-  APP_ENV: 'staging',
+  APP_ENV: ENV.TESTNET,
 
   /**
    * CHAIN INFO

src/config/config.types.ts

@@ -1,8 +1,10 @@
+import { ENV } from "@pushchain/devnet/src/lib/constants"
+
 export interface Config {
   // App-specific Configuration
   APP_NAME: string
   NODE_ENV: string
-  APP_ENV: string
+  APP_ENV: ENV
 
   // Chain Information
   ALLOWED_NETWORKS: number[]

src/modules/wallet/Wallet.tsx

@@ -165,7 +165,6 @@ const Wallet: FC<WalletProps> = () => {
 
         // Only single or no share is found directly ask user if they want to create a new wallet or go back
         const hasAnyShare = share1 || share2 || share3;
-        console.log("Has any share >>", hasAnyShare);
 
         if (hasAnyShare) {
           setShowReconstructionErrorModal(true);

src/modules/wallet/components/WalletActivityList.tsx

@@ -1,11 +1,11 @@
 import { FC, useCallback, useEffect, useRef, useState } from "react";
 
 import { Box, Text, Spinner } from "../../../blocks";
-import { Tx as PushTx } from "@pushprotocol/push-chain";
-import config from "../../../config";
-import { ENV } from "../../../constants";
-import { BlockType } from "@pushprotocol/push-chain/src/lib/block/block.types";
 import { WalletActivityListItem } from "./WalletActivityListItem";
+import { PushChain } from "@pushchain/devnet";
+import { ORDER } from '@pushchain/devnet/src/lib/constants'
+import { BlockType } from "@pushchain/devnet/src/lib/block/block.types";
+import config from "../../../config";
 
 export type WalletActivityListProps = {
   address: string;
@@ -24,14 +24,19 @@ const WalletActivityList: FC<WalletActivityListProps> = ({ address }) => {
       if (isLoading) return;
       setIsLoading(true);
       try {
-        const pushTx = await PushTx.initialize(config.APP_ENV as ENV);
-        const response = await pushTx.get(
-          Math.floor(Date.now()),
-          "DESC",
-          20,
-          pageNumber,
-          address || null
-        );
+        const pushChain = await PushChain.initialize(null, {
+          network: config.APP_ENV,
+          rpcUrl: import.meta.env.VITE_APP_RPC_URL,
+        });
+
+        const universalAccount = PushChain.utils.account.toUniversal(address)
+
+        const response = await pushChain.tx.get(universalAccount, {
+          startTime: Math.floor(Date.now()),
+          order: ORDER.DESC,
+          page: pageNumber,
+          limit: 20,
+        })
 
         const transactions = response.blocks
           .map((tx) => tx.transactions)
@@ -86,7 +91,7 @@ const WalletActivityList: FC<WalletActivityListProps> = ({ address }) => {
     >
       {activities.map((transaction, index) => (
         <WalletActivityListItem
-          key={`${transaction.txnHash}-${index}`}
+          key={`${transaction.hash}-${index}`}
           transaction={transaction}
           address={address}
         />

src/modules/wallet/components/WalletActivityListItem.tsx

@@ -2,8 +2,15 @@ import { Box, DefaultChainMonotone, ExternalLinkIcon, InternalLink, PushMonotone
 import { css } from 'styled-components';
 import { convertCaipToObject, formatWalletCategory, getFixedTime } from '../Wallet.utils';
 import { centerMaskWalletAddress, CHAIN_LOGO } from '../../../common';
+import { TxResponse } from '@pushchain/devnet/src/lib/tx/tx.types';
+import { FC } from 'react';
 
-const WalletActivityListItem = ({
+type WalletActivityListItemProps = {
+    transaction: TxResponse
+    address: string
+}
+
+const WalletActivityListItem: FC<WalletActivityListItemProps> = ({
     transaction,
     address
 }) => {
@@ -20,18 +27,18 @@ const WalletActivityListItem = ({
         }
     }
 
-    function fetchChainFromAddress(transaction) {
+    function fetchChainFromAddress(transaction: TxResponse) {
 
         let displayAddress = '';
         let additionalRecipients = 0;
-        if (address === transaction.sender) {
+        if (address === transaction.from) {
             // Address is the sender
-            const recipients = transaction.recipients.recipients;
-            displayAddress = recipients[0]?.address; // Show first recipient
+            const recipients = transaction.recipients;
+            displayAddress = recipients[0]; // Show first recipient
             additionalRecipients = recipients.length - 1; // Count additional recipients
-        } else if (transaction.recipients.recipients.some(recipient => recipient.address === address)) {
+        } else if (transaction.recipients.some(recipient => recipient === address)) {
             // Address is in recipients
-            displayAddress = transaction.sender; // Show sender address
+            displayAddress = transaction.from; // Show sender address
 
         }
 
@@ -95,19 +102,19 @@ const WalletActivityListItem = ({
                     width="32px"
                     height="32px"
                 >
-                    {address === transaction.sender ? <ExternalLinkIcon size={16} color="icon-primary" /> : transaction.recipients.recipients.some(recipient => recipient.address === address) && <InternalLink size={16} color="icon-primary" />}
+                    {address === transaction.from ? <ExternalLinkIcon size={16} color="icon-primary" /> : transaction.recipients.some(recipient => recipient === address) && <InternalLink size={16} color="icon-primary" />}
 
                 </Box>
                 <Box display="flex" flexDirection="column" gap='spacing-xxxs'>
                     <Text variant="bm-regular">
-                        {address === transaction.sender ? 'Send' : transaction.recipients.recipients.some(recipient => recipient.address === address) ? 'Receive' : null}
+                        {address === transaction.from ? 'Send' : transaction.recipients.some(recipient => recipient === address) ? 'Receive' : null}
                     </Text>
                     {fetchChainFromAddress(transaction)}
                 </Box>
             </Box>
             <Box display="flex" flexDirection="column" gap="spacing-xxxs">
                 <Text variant="bes-regular">{formatWalletCategory(transaction.category)}</Text>
-                <Text variant="c-semibold" color='text-tertiary'>{getFixedTime(transaction.ts)}</Text>
+                <Text variant="c-semibold" color='text-tertiary'>{getFixedTime(transaction.timestamp)}</Text>
             </Box>
 
         </Box>