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

TX confirmation modal 2.0 #742

Merged
merged 86 commits into from
Mar 26, 2018
Merged

TX confirmation modal 2.0 #742

merged 86 commits into from
Mar 26, 2018

Conversation

AllienWorks
Copy link
Member

@AllienWorks AllienWorks commented Jan 22, 2018

  • fixes Display fees when sending TX #637
  • more previews for blind TX & anon TX
  • so far only static (= not working) layout → needs to be connected to the backend
  • redesigned layout of TX confirmation modal
  • added TX information (info about public/blind/anon TXs and their implications)
  • added fee estimations
  • added fiat countervalues (when ready to be implemented)

Note: this PR was based on @pciavald's #724 because I couldn't access the Send tab due to the bug on dev. If needed, I can rebase on dev when fixed.

TODO

  • PRG: connect the static code to backend for live data (addresses, TX amounts etc.)

@AllienWorks AllienWorks added this to the 1.2 milestone Jan 22, 2018
@pciavald pciavald modified the milestones: 1.2.0, 1.1.1, 1.1.2 Jan 29, 2018
@coveralls
Copy link

Coverage Status

Coverage remained the same at 45.62% when pulling 10bc42c on enhancement/tx-confirm-modal into 96de545 on dev.

*updated AddressHelper utilites
*added send information from send component to confirmation component
*added variables to html
@AllienWorks
Copy link
Member Author

Waiting for #779 to be merged

@pciavald pciavald changed the base branch from dev to develop February 3, 2018 00:09
@kewde kewde self-assigned this Feb 4, 2018
kewde
kewde previously approved these changes Feb 10, 2018
Copy link
Collaborator

@kewde kewde left a comment

Choose a reason for hiding this comment

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

Looks good to me (after the fiat hidding).

& > .currency {
font-size: 17px;
}
& > .fiat {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we hide the fiat div via css rather than comments?
Easier later on & cleaner.

@kewde
Copy link
Collaborator

kewde commented Feb 12, 2018

When using the Amount class, make sure to initialize the variable with new Amount(0).

ringsize: number, numsignatures: number, substractfeefromamount: boolean) {
// @TODO: estimate fee should be change
public sendTransaction(tx: TransactionBuilder) {
tx.comment = tx.narration = tx.note;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Need to check this out..

@vikas-cis-zz
Copy link

Hye @kewde @anandsinghparihar when I started the electron for this branch and got this issue (OSX)
screen shot 2018-03-19 at 5 51 38 pm

@vikas-cis-zz
Copy link

On Send Payment When I move to public to blind and then again blind to public then I saw fee becomes 0

screen shot 2018-03-19 at 9 46 38 pm

@HenkSwardt
Copy link
Contributor

@kewde , can I ask that you please review this for us. We need this merged in order to start work on this MP task - #887

@particl particl deleted a comment from vikas-cis-zz Mar 19, 2018
@anandsinghparihar
Copy link
Contributor

@vikas-cis could you please debug that OSX error window ?

@vikas-cis-zz
Copy link

@anandsinghparihar yeah I am checking it :)

Thanks

@vikas-cis-zz
Copy link

#903 log issue has been fix here

Thanks

@@ -199,6 +199,7 @@ export class SendComponent implements OnInit {
}

dialogRef.componentInstance.dialogContent = txt;
console.log('>>>>???componentInstance????????>', this.send);

Choose a reason for hiding this comment

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

can you remove the console log @anandsinghparihar

Copy link

@vikas-cis-zz vikas-cis-zz left a comment

Choose a reason for hiding this comment

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

looks good to me (y)

@kewde kewde merged commit 49c51e0 into develop Mar 26, 2018
@kewde kewde deleted the enhancement/tx-confirm-modal branch March 26, 2018 11:44
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.

Display fees when sending TX
7 participants