Skip to content

Commit

Permalink
Fix some tests and remove some unused variables
Browse files Browse the repository at this point in the history
  • Loading branch information
user committed Nov 22, 2023
1 parent 8bb8f5c commit dcfc0fa
Show file tree
Hide file tree
Showing 15 changed files with 205 additions and 122 deletions.
43 changes: 18 additions & 25 deletions web/app.fluidity.money/app/queries/useUserActionsAggregate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,33 +111,26 @@ const queryAll: Queryable = {
}
`,
solana: gql`
query userActionsAggregateAll(
$offset: Int = 0,
$limit: Int = 12,
) {
solana: user_transactions_aggregate(
args: {
network_: "solana",
limit_: $limit,
offset_: $offset
query userActionsAggregateAll($offset: Int = 0, $limit: Int = 12) {
solana: user_transactions_aggregate(
args: { network_: "solana", limit_: $limit, offset_: $offset }
) {
value: amount
receiver: recipient_address
rewardHash: reward_hash
sender: sender_address
hash: transaction_hash
utility_amount
utility_name
winner: winning_address
reward: winning_amount
application
currency
timestamp: time
swap_in
type
}
) {
value: amount
receiver: recipient_address
rewardHash: reward_hash
sender: sender_address
hash: transaction_hash
utility_amount
utility_name
winner: winning_address
reward: winning_amount
application
currency
timestamp: time
swap_in
type
}
}
`,
};

Expand Down
39 changes: 19 additions & 20 deletions web/app.fluidity.money/app/queries/useUserTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,13 @@ const useUserTransactionsByAddress = async (
errors: `Failed to fetch GraphQL URL and headers for network ${network}`,
};

const result =
parseHasuraUserTransactions(
await jsonPost<
UserTransactionsByAddressBody,
HasuraUserTransactionRes
>(url, body, headers)
const result = parseHasuraUserTransactions(
await jsonPost<UserTransactionsByAddressBody, HasuraUserTransactionRes>(
url,
body,
headers
)
);

return result;
};
Expand Down Expand Up @@ -413,13 +413,13 @@ const useUserTransactionsByTxHash = async (
errors: `Failed to fetch GraphQL URL and headers for network ${network}`,
};

const result =
parseHasuraUserTransactions(
await jsonPost<
UserTransactionsByTxHashBody,
HasuraUserTransactionRes
>(url, body, headers)
);
const result = parseHasuraUserTransactions(
await jsonPost<UserTransactionsByTxHashBody, HasuraUserTransactionRes>(
url,
body,
headers
)
);

return result;
};
Expand Down Expand Up @@ -457,14 +457,13 @@ const useUserTransactionsAll = async (
errors: `Failed to fetch GraphQL URL and headers for network ${network}`,
};

const result =
parseHasuraUserTransactions(
await jsonPost<UserTransactionsAllBody, HasuraUserTransactionRes>(
url,
body,
headers
)
const result = parseHasuraUserTransactions(
await jsonPost<UserTransactionsAllBody, HasuraUserTransactionRes>(
url,
body,
headers
)
);

return result;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ beforeAll(() => {
describe("useUserUnclaimedRewards", () => {
it("should return a valid response", async () => {
const { data, error } = await useUserUnclaimedRewards(
"ethereum",
"arbitrum",
"0xeb6b882a295d316ac62c8cfcc81c3e37c084b7c5"
);
expect(data).toBeDefined();
Expand Down
2 changes: 1 addition & 1 deletion web/app.fluidity.money/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { SplitContextProvider } from "contexts/SplitProvider";
import CacheProvider from "contexts/CacheProvider";
import { useEffect, useState } from "react";
import { CookieConsent } from "@fluidity-money/surfing";
import {Buffer} from "buffer";
import { Buffer } from "buffer";

globalThis.Buffer = Buffer;

Expand Down
16 changes: 2 additions & 14 deletions web/app.fluidity.money/app/routes/$network.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import type { LoaderFunction } from "@remix-run/node";
import { Outlet, useLoaderData } from "@remix-run/react";
import serverConfig, { colors } from "~/webapp.config.server";
import { redirect } from "@remix-run/node";
import { useEffect, useMemo, useState, useContext } from "react";
import FluidityFacadeContext from "contexts/FluidityFacade";
import { SplitContext } from "contexts/SplitProvider";
import { useEffect, useMemo, useState } from "react";
import config from "../../webapp.config.js";

import EthereumProvider from "contexts/EthereumProvider";
Expand Down Expand Up @@ -83,16 +81,6 @@ const Provider = ({
return <ProviderComponent>{children}</ProviderComponent>;
};

const ProviderOutlet = () => {
const { client } = useContext(SplitContext);

return (
<>
<Outlet />
</>
);
};

type LoaderData = {
network: string;
explorer: string;
Expand Down Expand Up @@ -134,7 +122,7 @@ export default function Network() {
tokens={tokens}
colorMap={colors}
/>
<ProviderOutlet />
<Outlet />
</Provider>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ export const loader: LoaderFunction = async ({ params }) => {
const eacAggregatorProxyAddr =
config.contract.eac_aggregator_proxy[network as Chain];

const wethPrice = chainType(network) === "evm" ?
await getWethUsdPrice(
provider,
eacAggregatorProxyAddr,
EACAggregatorProxyAbi
) : 0;
const wethPrice =
chainType(network) === "evm"
? await getWethUsdPrice(
provider,
eacAggregatorProxyAddr,
EACAggregatorProxyAbi
)
: 0;

const regularTokens = tokens
.filter((token) => !token.isFluidOf)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,15 +240,14 @@ const UnclaimedWinnings = () => {
return (
<div className="pad-main">
{/* Info Card - Only accessible for Ethereum/Arbitrum */}
{(network === "arbitrum") &&
!!userUnclaimedRewards && (
<UserRewards
claimNow={true}
unclaimedRewards={userUnclaimedRewards}
claimedRewards={userClaimedRewards}
network={network}
/>
)}
{network === "arbitrum" && !!userUnclaimedRewards && (
<UserRewards
claimNow={true}
unclaimedRewards={userUnclaimedRewards}
claimedRewards={userClaimedRewards}
network={network}
/>
)}

{!!address && unclaimedData.state === "loading" && (
<div style={{ marginBottom: "12px" }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import type { Rewarders } from "~/util/rewardAggregates";
import type { TokenPerformance } from "~/util/tokenAggregate";

import { JsonRpcProvider } from "@ethersproject/providers";
import {
getTotalRewardPool,
} from "~/util/chainUtils/ethereum/transaction";
import { getTotalRewardPool } from "~/util/chainUtils/ethereum/transaction";
import { json } from "@remix-run/node";
import useApplicationRewardStatistics from "~/queries/useApplicationRewardStatistics";
import { aggregateRewards } from "~/util/rewardAggregates";
Expand Down
2 changes: 1 addition & 1 deletion web/app.fluidity.money/app/routes/wtf.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default function IndexPage() {

const enabledChains = CHAINS.filter(({ name }) => {
if (name === "POLY_ZK" && !showExperiment("enable-polygonzk")) return false;

return true;
});

Expand Down
30 changes: 28 additions & 2 deletions web/app.fluidity.money/app/styles/dashboard.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dcfc0fa

Please sign in to comment.