Skip to content

use recommended tx fee by default #506

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

Merged
acharb merged 3 commits into from
May 23, 2022
Merged

use recommended tx fee by default #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b0ca58
use recommended transaction fee by default
acharb May 20, 2022
3e05fd3
better conditional
acharb May 23, 2022
6d7bc1e
no children
acharb May 23, 2022
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
39 changes: 21 additions & 18 deletions extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,29 @@ export const SendSettingsFee = () => {
<FormRows>
<Field name="transactionFee">
{({ field }: FieldProps) => (
<Input
id="transaction-fee-input"
className="SendTo__input"
type="number"
{...field}
></Input>
<>
<Input
id="transaction-fee-input"
className="SendTo__input"
type="number"
{...field}
/>
<div className="TransactionFee__row">
<TextLink
underline
disabled={field.value === recommendedFee}
variant={TextLink.variant.secondary}
onClick={() =>
setFieldValue("transactionFee", recommendedFee)
}
>
Set recommended
</TextLink>
<span>{networkCongestion} congestion</span>
</div>
</>
)}
</Field>
<div className="TransactionFee__row">
<TextLink
underline
variant={TextLink.variant.secondary}
onClick={() =>
setFieldValue("transactionFee", recommendedFee)
}
>
Set recommended
</TextLink>
<span>{networkCongestion} congestion</span>
</div>
</FormRows>
<div className="SendPayment__btn-continue">
<Button
Expand Down
12 changes: 11 additions & 1 deletion extension/src/popup/components/sendPayment/SendSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, { useEffect } from "react";
import { useSelector, useDispatch } from "react-redux";
import { Formik, Form, Field, FieldProps } from "formik";
import {
Expand All @@ -10,6 +10,7 @@ import {

import { Button } from "popup/basics/buttons/Button";
import { navigateTo } from "popup/helpers/navigate";
import { useNetworkFees } from "popup/helpers/useNetworkFees";
import { ROUTES } from "popup/constants/routes";
import { PopupWrapper } from "popup/basics/PopupWrapper";
import { SubviewHeader } from "popup/components/SubviewHeader";
Expand All @@ -18,6 +19,7 @@ import {
saveMemo,
transactionDataSelector,
isPathPaymentSelector,
saveTransactionFee,
} from "popup/ducks/transactionSubmission";

import "../styles.scss";
Expand All @@ -28,6 +30,14 @@ export const SendSettings = ({ previous }: { previous: ROUTES }) => {
transactionDataSelector,
);
const isPathPayment = useSelector(isPathPaymentSelector);
const { recommendedFee } = useNetworkFees();

// use default transaction fee if unset
useEffect(() => {
if (!transactionFee) {
dispatch(saveTransactionFee(recommendedFee));
}
}, [dispatch, recommendedFee, transactionFee]);

return (
<PopupWrapper>
Expand Down
2 changes: 1 addition & 1 deletion extension/src/popup/ducks/transactionSubmission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ const initialState: InitialState = {
asset: "native",
destination: "",
federationAddress: "",
transactionFee: "0.00001",
transactionFee: "",
memo: "",
destinationAsset: "",
destinationAmount: "",
Expand Down