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

feat: APP-267 accounts orders page #2483

Merged
merged 37 commits into from
Oct 9, 2024
Merged

Conversation

r41ph
Copy link
Contributor

@r41ph r41ph commented Sep 25, 2024

Description

https://regennetwork.atlassian.net/browse/APP-267

Author Checklist

I have...

  • provided a link to the relevant issue or specification
  • provided instructions on how to test
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

How to test

  1. See stories in Storybook: https://deploy-preview-2483--regen-storybook.netlify.app/?path=/story/marketplace-organisms-order--default
  2. See the Orders page in the marketplace: https://deploy-preview-2483--regen-marketplace.netlify.app/profile/orders

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items
.

I have...

  • confirmed all author checklist items have been addressed
  • reviewed code correctness and readability
  • verified React components follow DRY principles
  • reviewed documentation is accurate
  • reviewed tests
  • manually tested (if applicable)

Copy link

netlify bot commented Sep 25, 2024

Deploy Preview for regen-website ready!

Name Link
🔨 Latest commit d235204
🔍 Latest deploy log https://app.netlify.com/sites/regen-website/deploys/670663bf01e19100080b8a5d
😎 Deploy Preview https://deploy-preview-2483--regen-website.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@r41ph r41ph requested a review from blushi September 25, 2024 14:33
@r41ph
Copy link
Contributor Author

r41ph commented Sep 25, 2024

@erikalogie see testing instructions

@erikalogie
Copy link
Collaborator

  1. https://deploy-preview-2483--regen-storybook.netlify.app/?path=/story/marketplace-organisms-order--default

@r41ph you did an awesome job with this! It really looks great, just a few little tiny details.

Monosnap Marketplace : Organisms : Order - Pending Order ⋅ Storybook 2024-09-25 14-43-10 Monosnap Marketplace : Organisms : Order - Prefinance ⋅ Storybook 2024-09-25 14-41-37 Monosnap Marketplace : Organisms : Order - Tradable Order ⋅ Storybook 2024-09-25 14-49-56 Monosnap Regen Marketplace 2024-09-25 14-46-27

@r41ph r41ph force-pushed the feat-APP-267-accounts-orders-oage branch from da00326 to a6b6ece Compare September 26, 2024 10:37
@r41ph
Copy link
Contributor Author

r41ph commented Sep 26, 2024

@r41ph you did an awesome job with this! It really looks great, just a few little tiny details.

@erikalogie thanks! Please review the style updates addressing your comments.

@erikalogie
Copy link
Collaborator

@r41ph looks awesome!

One final small thing, and otherwise LGTM!
Monosnap Marketplace : Organisms : Order - Tradable Order ⋅ Storybook 2024-09-26 11-42-06

@r41ph
Copy link
Contributor Author

r41ph commented Sep 30, 2024

@erikalogie have another look when you get a chance please

tailwind.css Show resolved Hide resolved
web-components/src/components/icons/BlockchainIcon.tsx Outdated Show resolved Hide resolved
web-components/src/components/icons/ReceiptIcon.tsx Outdated Show resolved Hide resolved
web-components/src/theme/muiTheme.ts Outdated Show resolved Hide resolved
const { credits, price, denom } = data as CreditsData;
const totalPrice = +credits * +price;
return (
<section className="flex gap-20">
Copy link
Member

Choose a reason for hiding this comment

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

instead of always repeating this same structure we could have a reusable component for all these sections that could take a title, icon and some row items as props

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In this case, I think creating a reusable component for these sections may add unnecessary complexity because the logic for each component is slightly different. While they share some structure (title, icon, rows), combining them into a single component would require a few conditional checks that would make them harder to work with. I believe that keeping them separated while using shared internal components allows each component to be simple to maintain and update.

Copy link
Member

Choose a reason for hiding this comment

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

then what about just having a reusable component with title, icon and children, which makes it more flexible?

@r41ph r41ph requested a review from blushi September 30, 2024 11:01
@erikalogie
Copy link
Collaborator

@r41ph looks great except now the left-alignment got messed up a bit:
Monosnap Marketplace : Organisms : Order - Crypto ⋅ Storybook 2024-09-30 08-13-37

@r41ph
Copy link
Contributor Author

r41ph commented Sep 30, 2024

@erikalogie please have another look

@erikalogie
Copy link
Collaborator

so nice! LGTM

Copy link
Member

@blushi blushi left a comment

Choose a reason for hiding this comment

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

I think the font for those labels is supposed to be Muli, not Lato, see https://www.figma.com/design/BTuUv6QXY4GbliZcXCe8RJ/Fiat-payments?node-id=3234-100679&node-type=instance&m=dev

image

I believe we could potentially reuse our TextButton component (getting rid of the hovering changing color) and this is how it's defined in figma as well

@r41ph r41ph force-pushed the feat-APP-267-accounts-orders-oage branch from 4d6e3f3 to c04c4c6 Compare October 1, 2024 10:19
@r41ph r41ph requested a review from blushi October 1, 2024 10:25
@r41ph r41ph force-pushed the feat-APP-267-accounts-orders-oage branch 2 times, most recently from d4238ef to 16d5609 Compare October 2, 2024 14:44
@clevinson
Copy link
Member

Nice work! just QA'd the flows and looks good to me!

One small on text is that I think it looks better if it says "Credit issuance pending" instead of "Credits issuance pending".
Screenshot 2024-10-02 at 4 51 01 PM

@r41ph
Copy link
Contributor Author

r41ph commented Oct 3, 2024

One small on text is that I think it looks better if it says "Credit issuance pending" instead of "Credits issuance pending".

And the other one: "Credits delivered", is this alright in plural?

@erikalogie
Copy link
Collaborator

One small on text is that I think it looks better if it says "Credit issuance pending" instead of "Credits issuance pending".

And the other one: "Credits delivered", is this alright in plural?

Yes this is good

@r41ph r41ph requested a review from blushi October 3, 2024 14:00
Copy link
Member

@blushi blushi left a comment

Choose a reason for hiding this comment

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

LGTM pre-approving
Pending small UI issue to be fixed for the transaction hash, the ellipsis is not underlined as it's shown on figma:

image

name: 'editable-credits',
});
fireEvent.change(editInput, { target: { value: 7 } });
if (editInput) {
Copy link
Member

Choose a reason for hiding this comment

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

looks like editInput is always null

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nice catch, thanks

@r41ph r41ph force-pushed the feat-APP-267-accounts-orders-oage branch from d0ec96e to d235204 Compare October 9, 2024 11:06
@r41ph r41ph merged commit 4a295a8 into dev Oct 9, 2024
14 checks passed
@r41ph r41ph deleted the feat-APP-267-accounts-orders-oage branch October 9, 2024 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants