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

fix: pending tx estates #448

Merged
merged 5 commits into from
Sep 6, 2018
Merged

fix: pending tx estates #448

merged 5 commits into from
Sep 6, 2018

Conversation

nachomazzara
Copy link
Contributor

@nachomazzara nachomazzara commented Sep 5, 2018

fix #407

Showing Estate pending transactions as:

screen shot 2018-09-05 at 7 23 21 pm

Also, fix the styles of using Container instead of div on forms pages

Double background color

screen shot 2018-09-05 at 7 19 56 pm

Not full width on mobile when showing pending tx

screen shot 2018-09-05 at 7 20 18 pm

Rename some token_id to id

I kept critics renames to be approached in other PR (when we decide to remove token_id from the db)

@nachomazzara nachomazzara changed the title Fix/pending tx estates fix: pending tx estates Sep 6, 2018
Copy link
Contributor

@nicosantangelo nicosantangelo left a comment

Choose a reason for hiding this comment

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

Cool!


.EstateModal .modal-buttons .ui.button + .ui.button {
margin-left: 0;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

this changes are not necessary, the shifted buttons are a result of EstateModal lacking a modal-children class on line 85.

Try it on master

estate,
estate: {
id: estate.id,
data: { name: estate.data.name, parcels: estate.data.parcels }
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we could have a utils fn to map the parcels leaving only the necessary props (x,y) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Parcels have an object { x, y } here

webapp/src/modules/estates/sagas.js Show resolved Hide resolved
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.

Transaction pending indicator when TX intent in non-related parcel
2 participants