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

fix: receive back button #2103

Merged
merged 2 commits into from
Feb 18, 2023
Merged

fix: receive back button #2103

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64d586e
fix: receive back button
manavdesai27 Feb 13, 2023
cf8449a
chore: clean and refactor code
manavdesai27 Feb 17, 2023
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
17 changes: 16 additions & 1 deletion src/app/screens/Receive/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,21 @@ function Receive() {
navigate("/receive");
}

function handleBack() {
if (invoice == null) {
navigate(-1);
}

setFormData({
amount: "0",
description: "",
expiration: "",
});
setPaid(false);
setPollingForPayment(false);
setInvoice(null);
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can DRY this up by using a function called

setDefaults() {
    setFormData({
      amount: "0",
      description: "",
      expiration: "",
    });
    setPaid(false);
    setPollingForPayment(false);
    setInvoice(null);
}

Copy link
Contributor Author

@manavdesai27 manavdesai27 Feb 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do! And welcome back! XD

async function createInvoice() {
try {
setLoading(true);
Expand Down Expand Up @@ -223,7 +238,7 @@ function Receive() {
title={t("title")}
headerLeft={
<IconButton
onClick={() => navigate("/")}
onClick={handleBack}
Copy link
Member

@im-adithya im-adithya Feb 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we can use it like this here:

onClick={() => {
    invoice ? setDefaults() : navigate("/");
}}

and in the receive again button:

onClick={() => {
    setDefaults();
    navigate("/receive");
}}

to avoid having handleBack and receiveAnotherPayment functions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! @im-adithya

icon={<CaretLeftIcon className="w-4 h-4" />}
/>
}
Expand Down