Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

State refactor: assets #41

Merged
merged 6 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/api/deleteAsset.ts

This file was deleted.

15 changes: 0 additions & 15 deletions src/api/getAssets.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/api/postAssets.ts

This file was deleted.

42 changes: 42 additions & 0 deletions src/apiQueries/useAssetsAdd.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { useMutation } from "@tanstack/react-query";
import { API_URL } from "constants/settings";
import { fetchApi } from "helpers/fetchApi";
import { ApiAsset, AppError } from "types";

type Asset = {
assetCode: string;
assetIssuer: string;
};

export const useAssetsAdd = ({
onSuccess,
}: {
onSuccess: (addedAsset: ApiAsset) => void;
}) => {
const mutation = useMutation({
mutationFn: ({ assetCode, assetIssuer }: Asset) => {
return fetchApi(`${API_URL}/assets`, {
method: "POST",
body: JSON.stringify({
code: assetCode,
issuer: assetIssuer,
}),
});
},
cacheTime: 0,
onSuccess,
});

return {
...mutation,
error: mutation.error as AppError,
data: mutation.data as ApiAsset,
mutateAsync: async ({ assetCode, assetIssuer }: Asset) => {
try {
await mutation.mutateAsync({ assetCode, assetIssuer });
} catch (e) {
// do nothing
}
},
};
};
20 changes: 20 additions & 0 deletions src/apiQueries/useAssetsByWallet.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { useQuery } from "@tanstack/react-query";
import { API_URL } from "constants/settings";
import { fetchApi } from "helpers/fetchApi";
import { ApiAsset, AppError } from "types";

export const useAssetsByWallet = (walletId: string) => {
const query = useQuery<ApiAsset[], AppError>({
queryKey: ["assets", "wallet", walletId],
queryFn: async () => {
if (!walletId) {
return;
}

return await fetchApi(`${API_URL}/assets?wallet=${walletId}`);
},
enabled: Boolean(walletId),
});

return query;
};
33 changes: 33 additions & 0 deletions src/apiQueries/useAssetsDelete.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { useMutation } from "@tanstack/react-query";
import { API_URL } from "constants/settings";
import { fetchApi } from "helpers/fetchApi";
import { ApiAsset, AppError } from "types";

export const useAssetsDelete = ({
onSuccess,
}: {
onSuccess: (deletedAsset: ApiAsset) => void;
}) => {
const mutation = useMutation({
mutationFn: (assetId: string) => {
return fetchApi(`${API_URL}/assets/${assetId}`, {
method: "DELETE",
});
},
cacheTime: 0,
onSuccess,
});

return {
...mutation,
error: mutation.error as AppError,
data: mutation.data as ApiAsset,
mutateAsync: async (assetId: string) => {
try {
await mutation.mutateAsync(assetId);
} catch (e) {
// do nothing
}
},
};
};
42 changes: 42 additions & 0 deletions src/apiQueries/useBalanceTrustline.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { useQuery } from "@tanstack/react-query";
import { API_URL } from "constants/settings";
import { fetchApi } from "helpers/fetchApi";
import { ApiAsset, AppError, StellarAccountBalance } from "types";

type Trustline = {
id: string | null;
code: string;
issuer: string;
balance: string;
isNative: boolean;
};

export const useBalanceTrustline = (
balances?: StellarAccountBalance[] | undefined,
) => {
const query = useQuery<Trustline[] | undefined, AppError>({
queryKey: ["trustlines", { balances }],
queryFn: async () => {
const response = await fetchApi(`${API_URL}/assets`);

return balances?.map((b) => {
const id =
response?.find(
(a: ApiAsset) =>
a.code === b?.assetCode && a.issuer === b?.assetIssuer,
)?.id || null;

return {
id,
code: b?.assetCode || "XLM",
issuer: b?.assetIssuer || "native",
balance: b.balance,
isNative: Boolean(!b.assetCode && !b.assetIssuer),
};
});
},
enabled: Boolean(balances),
});

return query;
};
21 changes: 13 additions & 8 deletions src/components/DisbursementDetails/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { useDispatch } from "react-redux";

import { AppDispatch } from "store";
import { getCountriesAction } from "store/ducks/countries";
import { getAssetsByWalletAction } from "store/ducks/assets";

import { useWallets } from "apiQueries/useWallets";
import { useAssetsByWallet } from "apiQueries/useAssetsByWallet";
import { InfoTooltip } from "components/InfoTooltip";
import { formatUploadedFileDisplayName } from "helpers/formatUploadedFileDisplayName";
import { useRedux } from "hooks/useRedux";
Expand Down Expand Up @@ -61,7 +61,7 @@ export const DisbursementDetails: React.FC<DisbursementDetailsProps> = ({
onChange,
onValidate,
}: DisbursementDetailsProps) => {
const { assets, countries } = useRedux("assets", "countries");
const { countries } = useRedux("countries");

enum FieldId {
NAME = "name",
Expand All @@ -76,6 +76,12 @@ export const DisbursementDetails: React.FC<DisbursementDetailsProps> = ({
isLoading: isWalletsLoading,
} = useWallets();

const {
data: walletAssets,
error: walletError,
isFetching: isWalletAssetsFetching,
} = useAssetsByWallet(details.wallet.id);

const dispatch: AppDispatch = useDispatch();

// Don't fetch again if we already have them in store
Expand All @@ -88,7 +94,7 @@ export const DisbursementDetails: React.FC<DisbursementDetailsProps> = ({
const apiErrors = [
countries.errorString,
walletsError?.message,
assets.errorString,
walletError?.message,
];

const sanitizedApiErrors = apiErrors.filter((e) => Boolean(e));
Expand Down Expand Up @@ -157,12 +163,11 @@ export const DisbursementDetails: React.FC<DisbursementDetailsProps> = ({
name: wallet?.name || "",
},
});
dispatch(getAssetsByWalletAction({ walletId: wallet?.id || "" }));

break;
case FieldId.ASSET_CODE:
// eslint-disable-next-line no-case-declarations
const asset = assets.items.find((a: ApiAsset) => a.id === value);
const asset = walletAssets?.find((a: ApiAsset) => a.id === value);

updateState({
asset: {
Expand Down Expand Up @@ -274,10 +279,10 @@ export const DisbursementDetails: React.FC<DisbursementDetailsProps> = ({
fieldSize="sm"
onChange={updateDraftDetails}
value={details.asset.id}
disabled={assets.status === "PENDING" || !details.wallet.id}
disabled={isWalletAssetsFetching || !details.wallet.id}
>
{renderDropdownDefault(assets.status === "PENDING")}
{assets.items.map((asset: ApiAsset) => (
{renderDropdownDefault(isWalletAssetsFetching)}
{walletAssets?.map((asset: ApiAsset) => (
<option key={asset.id} value={asset.id}>
{asset.code}
</option>
Expand Down
Loading