diff --git a/lib/types/user-actions/user-actions.go b/lib/types/user-actions/user-actions.go index f799592ae..fecc3eb6a 100644 --- a/lib/types/user-actions/user-actions.go +++ b/lib/types/user-actions/user-actions.go @@ -132,7 +132,7 @@ type ( // AggregatedTransactionFromUserAction to create a partially aggregated transaction from a user action func AggregatedTransactionFromUserAction(userAction UserAction) AggregatedUserTransaction { - var ( + var ( senderAddress string recipientAddress string ) @@ -180,7 +180,7 @@ func AggregatedTransactionFromPendingWinner(pendingWinner winners.PendingWinner) SenderAddress: senderAddress, // the sender is the winner of a pending win WinningAddress: senderAddress, - Type: "send", + Type: "send", } if pendingWinner.Utility == "FLUID" { diff --git a/web/app.fluidity.money/app/queries/useUserTransactions.ts b/web/app.fluidity.money/app/queries/useUserTransactions.ts index 8db0ae4f9..c83278903 100644 --- a/web/app.fluidity.money/app/queries/useUserTransactions.ts +++ b/web/app.fluidity.money/app/queries/useUserTransactions.ts @@ -4,9 +4,7 @@ import { hasuraDateToUnix, networkGqlBackend, } from "~/util/api/graphql"; -import BN from "bn.js"; import { - addDecimalToBn, getTokenFromAddress, Token, } from "~/util/chainUtils/tokens"; @@ -21,7 +19,7 @@ const queryByAddress: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "arbitrum" } token_short_name: { _in: $tokens } @@ -59,7 +57,7 @@ const queryByAddress: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "solana" } token_short_name: { _in: $tokens } @@ -79,7 +77,6 @@ const queryByAddress: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -97,7 +94,7 @@ const queryByAddress: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "polygon_zk" } token_short_name: { _in: $tokens } @@ -117,7 +114,6 @@ const queryByAddress: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -135,7 +131,7 @@ const queryByTxHash: Queryable = { $filterHashes: [String!] = [] $limit: Int = 12 ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "arbitrum" } _not: { transaction_hash: { _in: $filterHashes } } @@ -150,7 +146,6 @@ const queryByTxHash: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -165,7 +160,7 @@ const queryByTxHash: Queryable = { $filterHashes: [String!] = [] $limit: Int = 12 ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "solana" } _not: { transaction_hash: { _in: $filterHashes } } @@ -180,7 +175,6 @@ const queryByTxHash: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -196,7 +190,7 @@ const queryByTxHash: Queryable = { $filterHashes: [String!] = [] $limit: Int = 12 ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "polygon_zk" } _not: { transaction_hash: { _in: $filterHashes } } @@ -211,7 +205,6 @@ const queryByTxHash: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -230,7 +223,7 @@ const queryAll: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "arbitrum" } _not: { transaction_hash: { _in: $filterHashes } } @@ -263,7 +256,7 @@ const queryAll: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "solana" } _not: { transaction_hash: { _in: $filterHashes } } @@ -279,7 +272,6 @@ const queryAll: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -296,7 +288,7 @@ const queryAll: Queryable = { $limit: Int = 12 $tokens: [String!] = [] ) { - transfers: user_actions_lootbottles( + transfers: aggregated_user_transactions( where: { network: { _eq: "polygon_zk" } _not: { transaction_hash: { _in: $filterHashes } } @@ -312,7 +304,6 @@ const queryAll: Queryable = { time transaction_hash amount - token_decimals type swap_in application @@ -375,7 +366,6 @@ type HasuraUserTransaction = { sender_address: string; recipient_address: string; amount: number; - token_decimals: number; token_short_name: string; transaction_hash: string; time: string; @@ -552,12 +542,7 @@ const parseHasuraUserTransactions = ( return { sender: { address: senderAddress }, receiver: { address: recipientAddress }, - amount: Number( - addDecimalToBn( - new BN(String(transfer.amount)), - transfer.token_decimals - ) - ), + amount: transfer.amount, currency: { symbol: "f" + transfer.token_short_name }, transaction: { hash: transfer.transaction_hash }, block: { diff --git a/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx b/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx index 30fcbda26..182786e8d 100644 --- a/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx +++ b/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx @@ -25,7 +25,6 @@ export async function loader() { }, ].map(({ network, abi, getPrizePool }) => { const infuraRpc = config.drivers[network][mainnetId].rpc.http; - console.log("infura rpc", infuraRpc); const provider = new JsonRpcProvider(infuraRpc); const rewardPoolAddr = config.contract.prize_pool[network as Chain]; diff --git a/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx b/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx index 7380b3d3e..1bd542780 100644 --- a/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx +++ b/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx @@ -26,8 +26,8 @@ type UserTransaction = { value: number; currency: string; application: string; - lootboxCount: number; rewardTier: number; + lootboxCount: number; }; export type TransactionsLoaderData = { @@ -208,8 +208,8 @@ export const loader: LoaderFunction = async ({ params, request }) => { amount: value, currency: { symbol: currency }, application, - lootboxCount, rewardTier, + lootboxCount } = transaction; return { @@ -292,8 +292,8 @@ export const loader: LoaderFunction = async ({ params, request }) => { swapType, utilityTokens: winner.utility, application: tx.application, - lootboxCount: tx.lootboxCount, rewardTier: tx.rewardTier, + lootboxCount: tx.lootboxCount, }; }); @@ -316,4 +316,4 @@ export const loader: LoaderFunction = async ({ params, request }) => { ); return new Error("Server could not fulfill request"); } -}; +}; \ No newline at end of file