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.

Sign up for GitHub

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

SEP-6 new flow #353

Merged
merged 5 commits into from
Jul 3, 2024
Merged

SEP-6 new flow #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
214359c
SEP-6 deposit updated
quietbits Jun 26, 2024
65a8501
SEP-6 withdrawal updated
quietbits Jun 26, 2024
efcbda6
Pass txn id to withdraw customer request
quietbits Jun 27, 2024
fae0ce3
Update flows
quietbits Jun 27, 2024
301cac4
SEP-6 quotes (#355)
quietbits Jul 3, 2024
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
311 changes: 229 additions & 82 deletions packages/demo-wallet-client/src/components/AnchorQuotesModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@ import {
postSep38QuoteAction,
} from "ducks/sep38Quotes";
import { AppDispatch } from "config/store";
import { ActionStatus } from "types/types";
import { ActionStatus, AnchorBuyAsset } from "types/types";

interface AnchorQuotesModalProps {
token: string;
context: "sep31" | "sep6";
isDeposit: boolean;
onClose: () => void;
onSubmit: (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>,
quoteId?: string,
destinationAsset?: string,
buyAssset?: string,
sellAsset?: string,
) => void;
}

Expand All @@ -30,6 +33,8 @@ type QuoteAsset = {

export const AnchorQuotesModal = ({
token,
context,
isDeposit,
onClose,
onSubmit,
}: AnchorQuotesModalProps) => {
Expand All @@ -39,6 +44,8 @@ export const AnchorQuotesModal = ({
const [quoteAsset, setQuoteAsset] = useState<QuoteAsset>();
const [assetBuyDeliveryMethod, setAssetBuyDeliveryMethod] =
useState<string>();
const [assetSellDeliveryMethod, setAssetSellDeliveryMethod] =
useState<string>();
const [assetCountryCode, setAssetCountryCode] = useState<string>();
const [assetPrice, setAssetPrice] = useState<string>();

Expand All @@ -49,47 +56,122 @@ export const AnchorQuotesModal = ({
return new BigNumber(amount).div(rate).toFixed(2);
};

// Exclude sell asset from quote assets
const renderAssets = data.sellAsset
? data.assets.filter((a) => a.asset !== data.sellAsset)
: [];
const getRenderAssets = () => {
let selectedAsset: string | undefined;

if (context === "sep31") {
selectedAsset = isDeposit ? data.sellAsset : data.buyAsset;
} else if (context === "sep6") {
selectedAsset = isDeposit ? data.buyAsset : data.sellAsset;
}

// Exclude selected asset from quote assets
return selectedAsset
? data.assets.filter((a) => a.asset !== selectedAsset)
: [];
};

const renderAssets = getRenderAssets();

const handleGetAssetRates = () => {
if (data.serverUrl && data.sellAsset && data.sellAmount) {
dispatch(
fetchSep38QuotesPricesAction({
token,
anchorQuoteServerUrl: data.serverUrl,
options: {
sellAsset: data.sellAsset,
sellAmount: data.sellAmount,
buyDeliveryMethod: assetBuyDeliveryMethod,
countryCode: assetCountryCode,
},
}),
);
if (context === "sep31") {
if (data.serverUrl && data.sellAsset && data.amount) {
dispatch(
fetchSep38QuotesPricesAction({
token,
anchorQuoteServerUrl: data.serverUrl,
options: {
sellAsset: data.sellAsset,
sellAmount: data.amount,
buyDeliveryMethod: assetBuyDeliveryMethod,
sellDeliveryMethod: assetSellDeliveryMethod,
countryCode: assetCountryCode,
},
}),
);
}
} else if (context === "sep6") {
const sellAsset = isDeposit ? quoteAsset?.asset : data.sellAsset;

if (data.serverUrl && data.amount && sellAsset) {
dispatch(
fetchSep38QuotesPricesAction({
token,
anchorQuoteServerUrl: data.serverUrl,
options: {
sellAsset,
sellAmount: data.amount,
buyDeliveryMethod: assetBuyDeliveryMethod,
sellDeliveryMethod: assetSellDeliveryMethod,
countryCode: assetCountryCode,
},
}),
);
}
}
};

const handleGetQuote = () => {
if (
data.serverUrl &&
data.sellAsset &&
data.sellAmount &&
quoteAsset?.asset
) {
dispatch(
postSep38QuoteAction({
token,
anchorQuoteServerUrl: data.serverUrl,
sell_asset: data.sellAsset,
buy_asset: quoteAsset.asset,
sell_amount: data.sellAmount,
buy_delivery_method: assetBuyDeliveryMethod,
country_code: assetCountryCode,
context: "sep31",
}),
);
if (context === "sep31") {
if (
data.serverUrl &&
data.sellAsset &&
data.amount &&
quoteAsset?.asset
) {
dispatch(
postSep38QuoteAction({
token,
anchorQuoteServerUrl: data.serverUrl,
sell_asset: data.sellAsset,
buy_asset: quoteAsset.asset,
sell_amount: data.amount,
buy_delivery_method: assetBuyDeliveryMethod,
sell_delivery_method: assetSellDeliveryMethod,
country_code: assetCountryCode,
context,
}),
);
}
} else if (context === "sep6") {
if (isDeposit) {
if (
data.serverUrl &&
data.buyAsset &&
data.amount &&
quoteAsset?.asset
) {
dispatch(
postSep38QuoteAction({
token,
anchorQuoteServerUrl: data.serverUrl,
sell_asset: quoteAsset.asset,
buy_asset: data.buyAsset,
sell_amount: data.amount,
buy_delivery_method: assetBuyDeliveryMethod,
sell_delivery_method: assetSellDeliveryMethod,
country_code: assetCountryCode,
context,
}),
);
}
} else {
if (data.serverUrl && data.sellAsset && quoteAsset?.asset) {
dispatch(
postSep38QuoteAction({
token,
anchorQuoteServerUrl: data.serverUrl,
sell_asset: data.sellAsset,
buy_asset: quoteAsset.asset,
sell_amount: data.amount,
buy_delivery_method: assetBuyDeliveryMethod,
sell_delivery_method: assetSellDeliveryMethod,
country_code: assetCountryCode,
context,
}),
);
}
}
}
};

Expand Down Expand Up @@ -158,7 +240,14 @@ export const AnchorQuotesModal = ({
<Button
onClick={(
event: React.MouseEvent<HTMLButtonElement, MouseEvent>,
) => onSubmit(event, data.quote?.id, data.quote?.buy_asset)}
) =>
onSubmit(
event,
data.quote?.id,
data.quote?.buy_asset,
data.quote?.sell_asset,
)
}
>
Submit
</Button>
Expand All @@ -167,17 +256,36 @@ export const AnchorQuotesModal = ({
);
}

if (data.prices?.length > 0) {
const sellAssetCode = data.sellAsset?.split(":")[1];
const buyAssetCode = quoteAsset?.asset.split(":")[1];
if (data.prices?.length > 0 && quoteAsset?.asset) {
let sellAssetCode: string | undefined;
let buyAssetCode: string | undefined;
let prices: AnchorBuyAsset[] = [];

if (context === "sep31") {
sellAssetCode = data.sellAsset?.split(":")[1];
buyAssetCode = quoteAsset?.asset.split(":")[1];
prices = data.prices.filter((p) => p.asset === quoteAsset.asset);
}

if (context === "sep6") {
if (isDeposit) {
sellAssetCode = data.buyAsset?.split(":")[1];
buyAssetCode = quoteAsset?.asset.split(":")[1];
prices = data.prices.filter((p) => p.asset === data.buyAsset);
} else {
sellAssetCode = data.sellAsset?.split(":")[1];
buyAssetCode = quoteAsset?.asset.split(":")[1];
prices = data.prices.filter((p) => p.asset === quoteAsset.asset);
}
}

return (
<>
<Modal.Body>
<p>Rates (not final)</p>

<div>
{data.prices.map((p) => (
{prices.map((p) => (
<RadioButton
key={`${p.asset}-${p.price}`}
name="anchor-asset-price"
Expand All @@ -190,13 +298,11 @@ export const AnchorQuotesModal = ({
))}
</div>

{data.sellAmount && assetPrice ? (
{data.amount && assetPrice ? (
<div>{`Estimated total of ${calculateTotal(
data.sellAmount,
data.amount,
assetPrice,
)} ${buyAssetCode} for ${
data.sellAmount
} ${sellAssetCode}`}</div>
)} ${buyAssetCode} for ${data.amount} ${sellAssetCode}`}</div>
) : null}
</Modal.Body>

Expand Down Expand Up @@ -227,47 +333,88 @@ export const AnchorQuotesModal = ({
setQuoteAsset({
asset: a.asset,
});
setAssetCountryCode("");
setAssetBuyDeliveryMethod(undefined);
setAssetSellDeliveryMethod(undefined);
}}
checked={a.asset === quoteAsset?.asset}
/>

{/* TODO: Better UI */}
<div style={{ paddingLeft: 20 }}>
<div>Country codes</div>
<div>
{a.country_codes?.map((c) => (
<RadioButton
key={c}
name={`anchor-${a.asset}-country`}
id={c}
label={c}
disabled={a.asset !== quoteAsset?.asset}
onChange={() => {
setAssetCountryCode(c);
}}
checked={c === assetCountryCode}
/>
))}
</div>

<>
<div>Buy delivery methods</div>
<div>
{a.buy_delivery_methods?.map((b) => (
<RadioButton
key={b.name}
name={`anchor-${a.asset}-delivery`}
id={b.name}
label={`${b.name} - ${b.description}`}
disabled={a.asset !== quoteAsset?.asset}
onChange={() => {
setAssetBuyDeliveryMethod(b.name);
}}
checked={b.name === assetBuyDeliveryMethod}
/>
))}
</div>
</>
{a.country_codes && a.country_codes.length > 0 ? (
<>
<div>Country codes</div>
<div>
{a.country_codes?.map((c) => (
<RadioButton
key={`anchor-${a.asset}-country-${c}`}
name={`anchor-${a.asset}-country`}
id={`anchor-${a.asset}-country-${c}`}
label={c}
disabled={a.asset !== quoteAsset?.asset}
onChange={() => {
setAssetCountryCode(c);
}}
checked={
a.asset === quoteAsset?.asset &&
c === assetCountryCode
}
/>
))}
</div>
</>
) : null}

{a.buy_delivery_methods &&
a.buy_delivery_methods.length > 0 ? (
<>
<div>Buy delivery methods</div>
<div>
{a.buy_delivery_methods?.map((b) => (
<RadioButton
key={`anchor-${a.asset}-delivery-${b.name}`}
name={`anchor-${a.asset}-delivery`}
id={`anchor-${a.asset}-delivery-${b.name}`}
label={`${b.name} - ${b.description}`}
disabled={a.asset !== quoteAsset?.asset}
onChange={() => {
setAssetBuyDeliveryMethod(b.name);
}}
checked={
a.asset === quoteAsset?.asset &&
b.name === assetBuyDeliveryMethod
}
/>
))}
</div>
</>
) : null}

{a.sell_delivery_methods &&
a.sell_delivery_methods.length > 0 ? (
<>
<div>Sell delivery methods</div>
<div>
{a.sell_delivery_methods?.map((b) => (
<RadioButton
key={`anchor-${a.asset}-delivery-sell-${b.name}`}
name={`anchor-${a.asset}-delivery-sell`}
id={`anchor-${a.asset}-delivery-sell-${b.name}`}
label={`${b.name} - ${b.description}`}
disabled={a.asset !== quoteAsset?.asset}
onChange={() => {
setAssetSellDeliveryMethod(b.name);
}}
checked={
a.asset === quoteAsset?.asset &&
b.name === assetSellDeliveryMethod
}
/>
))}
</div>
</>
) : null}
</div>
</div>
))}
Expand Down
Loading