merge develop into main

src/app/api/_data/blk-service.ts

@@ -5,6 +5,7 @@ import {
   API3_ENABLED,
   defaultBalance,
   BACKEND_API_URL,
+  defaultBalances,
   tokensByNetwork,
   BACKEND_API_TOKEN,
   nodeProviderUrlSepolia
@@ -17,19 +18,17 @@ import TokenPriceFeedsAbi from './_abis/TokenPriceFeedsAbi.json'
 
 // ---------------------------------------------------------------------------------------------
 
-export async function transferAll(walletTo: string): Promise<boolean> {
+export async function transferAll(channelUserId: string, walletTo: string): Promise<boolean> {
   try {
-    // TODO:
-    // const data = { wallet: walletTo }
-    // const response = await axios.post(`${BACKEND_API_URL}/transferall`, data)
+    const data = { channel_user_id: channelUserId, dst_address: walletTo }
+    await axios.post(`${BACKEND_API_URL}/withdraw_funds`, data)
     return true
   } catch (error) {
     console.error('Error transfering all funds:', error)
-    throw error
+    return true // avoid transfer-all error
   }
 }
 export async function getBalancesWithTotalsFromBackend(walletAddress: string): Promise<IBalances> {
-  let balances: IBalances
   const cacheKey = `getBalancesWithTotalsFromBackend.${walletAddress}`
   const fromCache = cache.get(cacheKey) as IBalances
 
@@ -38,36 +37,42 @@ export async function getBalancesWithTotalsFromBackend(walletAddress: string): P
     return fromCache
   }
 
+  let responseBalances: IBalances
   try {
     const response = await axios.get(`${BACKEND_API_URL}/balance/${walletAddress}`, {
       headers: {
         Authorization: `Bearer ${BACKEND_API_TOKEN}`
       }
     })
-    const data = response.data as IBalances
+    responseBalances = response.data.data
+  } catch (error) {
+    console.error('Error fetching balance from backend:', error)
+    responseBalances = defaultBalances
+  }
 
-    // Convert keys to lowercase
-    const normalizedTotals = Object.keys(data.totals).reduce(
+  // Convert keys to lowercase
+  try {
+    const normalizedTotals = Object.keys(responseBalances.totals).reduce(
       (acc, key) => {
         const lowerKey = key.toLowerCase() as CurrencyKey
         if (['usd', 'ars', 'brl', 'uyu'].includes(lowerKey)) {
-          acc[lowerKey] = data.totals[key as CurrencyKey]
+          acc[lowerKey] = responseBalances.totals[key as CurrencyKey]
         }
         return acc
       },
       {} as Record<CurrencyKey, number>
     )
 
-    balances = {
-      ...data,
+    const balances: IBalances = {
+      ...responseBalances,
       totals: normalizedTotals
     }
 
     cache.set(cacheKey, balances, 60) // 1 minute
     return balances
   } catch (error) {
-    console.error('Error fetching balance from backend:', error)
-    throw error
+    console.error('Error formatting balances totals:', error)
+    return defaultBalances
   }
 }
 

src/app/api/_hooks/api-resolver.ts

@@ -57,12 +57,12 @@ export const endpoints = {
       id: (id: string) => getFullUIEndpoint(`user/${id}`),
       update: (id: string) => getFullUIEndpoint(`user/${id}`),
       code: (id: string) => getFullUIEndpoint(`user/${id}/code`),
-      updateEmail: (id: string) => getFullUIEndpoint(`user/${id}/email`)
+      updateEmail: (id: string) => getFullUIEndpoint(`user/${id}/email`),
+      transferAll: (id: string) => getFullUIEndpoint(`user/${id}/transfer-all`)
     },
     wallet: {
       balance: (id: string) => getFullUIEndpoint(`wallet/${id}/balance`),
       transactions: (id: string) => getFullUIEndpoint(`wallet/${id}/transactions`),
-      transferAll: (id: string) => getFullUIEndpoint(`wallet/${id}/transferAll`),
       nfts: {
         root: (id: string) => getFullUIEndpoint(`wallet/${id}/nfts`),
         id: (walletId: string, nftId: string) =>

src/app/api/_hooks/use-wallet.ts

@@ -22,7 +22,9 @@ export function useGetWalletNft(walletId: string, nftId: string) {
 
 // ----------------------------------------------------------------------
 
-export async function transferAll(walletId: string, data: { walletTo: string }) {
-  const res = await post(endpoints.dashboard.wallet.transferAll(walletId), data, {})
+export async function transferAll(userId: string, data: { walletTo: string }) {
+  console.log('trasnfer all', userId, data)
+  const res = await post(endpoints.dashboard.user.transferAll(userId), data, {})
+  console.log('x', res)
   return res
 }

src/app/api/v1/wallet/[id]/transfer-all/route.ts → src/app/api/v1/user/[id]/transfer-all/route.ts

@@ -1,6 +1,9 @@
 import { NextRequest, NextResponse } from 'next/server'
 
 import { transferAll } from 'src/app/api/_data/blk-service'
+import { getUserById } from 'src/app/api/_data/data-service'
+
+import { IAccount } from 'src/types/account'
 
 // ----------------------------------------------------------------------
 
@@ -42,7 +45,18 @@ export async function POST(req: NextRequest, { params }: { params: IParams }) {
       )
     }
 
-    const result: boolean = await transferAll(walletTo)
+    const user: IAccount | undefined = await getUserById(id)
+    if (!user) {
+      return new NextResponse(
+        JSON.stringify({ code: 'USER_NOT_FOUND', error: 'user not found with that id' }),
+        {
+          status: 404,
+          headers: { 'Content-Type': 'application/json' }
+        }
+      )
+    }
+
+    const result: boolean = await transferAll(user.id, walletTo)
     if (!result) {
       return new NextResponse(
         JSON.stringify({

src/app/nfts/share/[id]/layout.tsx

@@ -0,0 +1,13 @@
+'use client'
+
+import MainLayout from 'src/layouts/main'
+
+// ----------------------------------------------------------------------
+
+type Props = {
+  children: React.ReactNode
+}
+
+export default function Layout({ children }: Props) {
+  return <MainLayout>{children}</MainLayout>
+}

src/app/nfts/share/[id]/page.tsx

@@ -0,0 +1,11 @@
+import NftShareView from 'src/sections/nfts/view/nft-share-view'
+
+// ----------------------------------------------------------------------
+
+export const metadata = {
+  title: 'NFT Share'
+}
+
+export default function NftMintPage({ params }: { params: { id: string } }) {
+  return <NftShareView nftId={params.id} />
+}

src/app/nfts/share/page.tsx

@@ -0,0 +1,7 @@
+import { redirect } from 'next/navigation'
+
+// ----------------------------------------------------------------------
+
+export default function Share() {
+  return redirect('/')
+}

src/components/hook-form/rhf-text-field.tsx

@@ -19,11 +19,15 @@ export default function RHFTextField({ name, helperText, type, ...other }: Props
         <TextField
           {...field}
           fullWidth
-          type={type}
+          type={type === 'wallet' ? 'text' : type}
           value={type === 'number' && field.value === 0 ? '' : field.value}
           onChange={(event) => {
+            let inputValue = event.target.value
             if (type === 'number') {
-              field.onChange(Number(event.target.value))
+              field.onChange(Number(inputValue))
+            } else if (type === 'wallet') {
+              inputValue = inputValue.replace(/[^a-zA-Z0-9]/g, '')
+              field.onChange(inputValue.startsWith('0x') ? inputValue : `0x${inputValue}`)
             } else {
               field.onChange(event.target.value)
             }

src/config-global.ts

@@ -1,4 +1,5 @@
 import { Network } from './types/networks'
+import { IBalance, IBalances } from './types/wallet'
 
 // ----------------------------------------------------------------------
 
@@ -56,7 +57,7 @@ export const STORAGE_KEY_SETTINGS = 'settings'
 export const CONTACT_EMAIL = 'contacto@chatterpay.com.ar'
 export const GET_BALANCES_FROM_BACKEND = true
 
-export const defaultBalance = {
+export const defaultBalance: IBalance = {
   network: '',
   token: '',
   balance: 0,
@@ -68,6 +69,19 @@ export const defaultBalance = {
   }
 }
 
+export const defaultBalances: IBalances = {
+  balances: [defaultBalance],
+  totals: {
+    usd: 0,
+    ars: 0,
+    brl: 0,
+    uyu: 0
+  },
+  certificates: [],
+  wallet: '',
+  message: ''
+}
+
 export const tokensByNetwork: { [networkKey: string]: Network } = {
   scroll_testnet: {
     config: {

src/layouts/common/account-popover.tsx

@@ -28,7 +28,7 @@ export default function AccountPopover() {
   const OPTIONS = [
     {
       label: t('menu.account'),
-      linkTo: paths.dashboard.user.account
+      linkTo: paths.dashboard.user.root
     }
   ]
 

src/layouts/dashboard/config-navigation.tsx

@@ -53,7 +53,7 @@ export function useNavData() {
             title: t('menu.user'),
             path: paths.dashboard.user.root,
             icon: ICONS.user,
-            children: [{ title: t('menu.account'), path: paths.dashboard.user.account }]
+            children: [{ title: t('menu.account'), path: paths.dashboard.user.root }]
           }
         ]
       }

src/locales/langs/br.json

@@ -11,7 +11,7 @@
     "required": "obrigatório",
     "must-be-numeric": "Deve ser numérico",
     "must-be-max": "Deve ter no máximo {MAX_DIGITS} dígitos",
-    "must-be-valid-email": "O email deve ser um endereço de email válido",    
+    "must-be-valid-email": "O email deve ser um endereço de email válido",
     "must-be-min": "Deve ter no mínimo {MIN_CHARS} caracteres",
     "nodata": "Sem Dados",
     "save": "Salvar Alterações",
@@ -33,7 +33,8 @@
     "user": "Usuário",
     "account": "Conta",
     "logout": "Sair",
-    "email": "Alterar Email"
+    "email": "Alterar Email",
+    "transfer-all": "Transfer Tudo"
   },
   "terms": {
     "title": "Termos e Condições",
@@ -249,7 +250,7 @@
           "answer": "Digite seu número de telefone registrado. Um código de 6 dígitos será enviado para o seu telefone por segurança; depois de inseri-lo, você poderá acessar o site."
         }
       }
-    },    
+    },
     "get-started": {
       "title": "Comece com",
       "description": "Todo o poder do Web3 sem complicações.",
@@ -290,6 +291,7 @@
     "title": "Saldo Estimado",
     "deposit": "Depositar",
     "send": "Enviar",
+    "transfer-all": "Transferir Tudo",
     "wapp-msg": "Olá!"
   },
   "transactions": {
@@ -305,6 +307,16 @@
     "receive-from": "Recebido dinheiro de",
     "sent-to": "Enviado dinheiro para"
   },
+  "transfer-all": {
+    "info": "Indica um endereço de carteira para onde serão enviados todos os fundos que você possui no Chatterpay.",
+    "msgs": {
+      "ok": "Os fundos foram transferidos. Você os verá na carteira indicada em breve.",
+      "error": "Houve um erro ao tentar transferir os fundos."
+    },
+    "actions": {
+      "transfer": "Transferir Tudo"
+    }
+  },
   "nfts": {
     "view-trx": "Ver detalhes da transação",
     "mint": "Ei, dá uma olhada no meu NFT:",
@@ -323,6 +335,10 @@
       "cta-msg": "Reivindique seu certificado na blockchain gratuitamente!",
       "opensea-alt": "logo open sea",
       "wapp-msg": "Gostaria de mintar o NFT"
+    },
+    "share": {
+      "cta": "Compartilhar certificado",
+      "clipboard": "Link copiado!"
     }
   },
   "account": {
@@ -340,4 +356,4 @@
       "code-bot": "Insira este código {2FA_CODE} para validar a alteração do seu e-mail no Chatterpay. É muito importante que você não compartilhe esta informação com ninguém. Se você não solicitou o código, desconsidere esta mensagem e entre em contato conosco para que possamos ajudá-lo!"
     }
   }
-}
+}

src/locales/langs/en.json

@@ -33,12 +33,13 @@
     "user": "User",
     "account": "Account",
     "logout": "Logout",
-    "email": "Email Change"
+    "email": "Email Change",
+    "transfer-all": "Transfer All"
   },
   "home": {
     "header": {
-    "sign-up": "Create your account",
-    "sign-in": "Sign in"
+      "sign-up": "Create your account",
+      "sign-in": "Sign in"
     },
     "help": {
       "need-help": "Need help?"
@@ -290,13 +291,14 @@
     "title": "Estimated Balance",
     "deposit": "Deposit",
     "send": "Send",
+    "transfer-all": "Transfer All",
     "wapp-msg": "Hi!"
-  }, 
+  },
   "transactions": {
     "title": "Recent Transactions",
     "table-transaction": "Transaction",
     "table-amount": "Amount",
-    "table-date": "Date", 
+    "table-date": "Date",
     "table-status": "Status",
     "table-view-all": "View All",
     "table-download": "Download",
@@ -305,6 +307,16 @@
     "receive-from": "Received money from",
     "sent-to": "Sent money to"
   },
+  "transfer-all": {
+    "info": "Indicates a wallet address where all funds in Chatterpay will be sent.",
+    "msgs": {
+      "ok": "The funds were transferred. You will see them in the indicated wallet shortly.",
+      "error": "There was an error attempting to transfer the funds."
+    },
+    "actions": {
+      "transfer": "Transfer All"
+    }
+  },
   "nfts": {
     "view-trx": "View Transacton Details",
     "mint": "Hey, check out my NFT:",
@@ -323,6 +335,10 @@
       "cta-msg": "Claim your certificate on the blockchain for free!",
       "opensea-alt": "open sea logo",
       "wapp-msg": "I would like to mint the NFT"
+    },
+    "share": {
+      "cta": "Share",
+      "clipboard": "Link copied!"
     }
   },
   "account": {