Clean code, remove ./wallet folder

components/molecules/form-pledge/index.tsx

@@ -3,11 +3,8 @@ import { AmountInput, Button, Checkbox } from '../../atoms'
 import { TransactionModal } from '../../molecules/transaction-modal'
 import { Utils } from '../../../shared/utils'
 import styles from './style.module.css'
-import { useSendTransaction, useContractValue } from '@soroban-react/contracts'
+import { useSendTransaction, useContractValue, contractTransaction } from '@soroban-react/contracts'
 import { useSorobanReact } from '@soroban-react/core'
-import {
-  useNetwork,
-} from '../../../wallet'
 import * as SorobanClient from 'soroban-client'
 import BigNumber from 'bignumber.js'
 import * as convert from '../../../convert'
@@ -72,7 +69,7 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
   const [resultSubmit, setResultSubmit] = useState<IResultSubmit | undefined>()
   const [input, setInput] = useState('')
   const [isSubmitting, setSubmitting] = useState(false)
-  const { server } = useNetwork()
+  const { server } = sorobanContext
 
   const parsedAmount = BigNumber(amount || 0)
 
@@ -100,17 +97,15 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
 
     try {
       // Deposit the tokens
-      let result = await sendTransaction(
-        contractTransaction(
-          props.networkPassphrase,
-          source,
-          props.crowdfundId,
-          'deposit',
-          new SorobanClient.Address(props.account).toScVal(),
-          amountScVal
-        ),
-        {sorobanContext}
-      )
+      let  tx = contractTransaction({
+        source,
+        networkPassphrase: props.networkPassphrase,
+        contractId: props.crowdfundId,
+        method: 'deposit',
+        params: [new SorobanClient.Address(props.account).toScVal(), amountScVal]
+      })
+      let result = await sendTransaction(tx, {sorobanContext})
+
       setResultSubmit({
         status: 'success',
         scVal: result,
@@ -133,25 +128,6 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
     }
   }
 
-  // Small helper to build a contract invokation transaction
-  function contractTransaction(
-    networkPassphrase: string,
-    source: SorobanClient.Account,
-    contractId: string,
-    method: string,
-    ...params: SorobanClient.xdr.ScVal[]
-  ): SorobanClient.Transaction {
-    const contract = new SorobanClient.Contract(contractId)
-    return new SorobanClient.TransactionBuilder(source, {
-        // TODO: Figure out the fee
-        fee: '100',
-        networkPassphrase,
-      })
-      .addOperation(contract.call(method, ...params))
-      .setTimeout(SorobanClient.TimeoutInfinite)
-      .build()
-  }
-
   return (
     <div>
       <h6>Choose Amount</h6>
@@ -232,8 +208,9 @@ const FormPledge: FunctionComponent<IFormPledgeProps> = props => {
     symbol: string
   }) {
     const [isSubmitting, setSubmitting] = useState(false)
-    const { activeChain, server } = useNetwork()
-    const networkPassphrase = activeChain?.networkPassphrase ?? ''
+    const server = sorobanContext.server
+    const networkPassphrase = sorobanContext.activeChain?.networkPassphrase
+
 
     const { sendTransaction } = useSendTransaction()
     const amount = BigNumber(100)

components/molecules/wallet-data/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
-import { DropdownSvg } from '../../../assets/icons'
-import { useAccount, useIsMounted, useNetwork } from '../../../wallet'
+import { useSorobanReact } from '@soroban-react/core'
+import { useAccount, useIsMounted} from '../../../hooks'
 import { ConnectButton } from '../../atoms'
 import styles from './style.module.css'
 import Image from 'next/image'
@@ -11,7 +11,8 @@ export function WalletData() {
 
   const { data: account } = useAccount()
 
-  const { activeChain: chain, chains } = useNetwork()
+  const { activeChain: chain, chains } = useSorobanReact()
+
 
   const unsupportedChain = chain?.unsupported
 

components/organisms/pledge/index.tsx

@@ -4,9 +4,8 @@ import styles from './style.module.css'
 import { Spacer } from '../../atoms/spacer'
 import { Utils } from '../../../shared/utils'
 import {
-  useAccount,
-  useNetwork,
-} from '../../../wallet'
+  useAccount
+} from '../../../hooks'
 import { useContractValue } from '@soroban-react/contracts'
 import * as SorobanClient from 'soroban-client'
 import { Deposits, FormPledge } from '../../molecules'
@@ -17,11 +16,12 @@ let xdr = SorobanClient.xdr
 
 const Pledge: FunctionComponent = () => {
   const { data: account } = useAccount()
-  const { activeChain } = useNetwork()
+  const sorobanContext = useSorobanReact()
+
+  const { activeChain } = sorobanContext
 
   const networkPassphrase = activeChain?.networkPassphrase ?? ''
 
-  const sorobanContext = useSorobanReact()
   // Call the contract rpcs to fetch values
   const useLoadToken = (): any => {
     return {

hooks/index.tsx

@@ -0,0 +1,2 @@
+export * from "./useAccount";
+export * from "./useIsMounted";

wallet/hooks/useAccount.tsx → hooks/useAccount.tsx

@@ -1,4 +1,3 @@
-import React, {useContext} from 'react';
 import { useSorobanReact } from "@soroban-react/core";
 export function useAccount() {
   const {address} = useSorobanReact()