Skip to content
Snippets Groups Projects

#236 Confirmation display - good MR

Merged #236 Confirmation display - good MR
1 unresolved thread
Merged matograine requested to merge confirmation_display into dev
1 unresolved thread
  • Modify the confirmation display.
  • Add tests for transaction confirmation.
Edited by matograine

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Moul
  • Moul
  • Moul
  • matograine added 7 commits

    added 7 commits

    • 25fd970f - 1 commit from branch dev
    • bcb02d7a - modify confirmation display. Add functions display_output(), display_amount(),...
    • 2b0df4ec - Writing tests for tx functions. Apply black on tx.py
    • 75f757a2 - removing display_output_and_amount
    • 43d56634 - remove display_output_and_amount() from tests, add transaction_confirmation()...
    • 339f4e2c - adding tx parameter in display_pubkey() for Backchange.
    • 9e10a4e8 - * make display_amount() lighter and add currency_symbol after "UD"

    Compare with previous version

  • Moul
  • Moul
  • matograine added 7 commits

    added 7 commits

    • 68203baa - modify confirmation display. Add functions display_output(), display_amount(),...
    • b928e0c8 - Writing tests for tx functions. Apply black on tx.py
    • c7f9f639 - removing display_output_and_amount
    • 44ecd966 - remove display_output_and_amount() from tests, add transaction_confirmation()...
    • b8a55173 - adding tx parameter in display_pubkey() for Backchange.
    • 0ec4270b - LEARNING GIT BAYBY (nothing changed, still conflicts to resolve)
    • 18569ebc - can't manage to mock functions

    Compare with previous version

  • matograine mentioned in merge request !105 (closed)

    mentioned in merge request !105 (closed)

  • matograine changed title from WIP : #236 (closed) Confirmation display to WIP : #236 (closed) Confirmation display - good MR

    changed title from WIP : #236 (closed) Confirmation display to WIP : #236 (closed) Confirmation display - good MR

  • matograine changed the description

    changed the description

  • Moul
  • Moul
  • Moul
  • Moul
  • matograine added 15 commits

    added 15 commits

    • 18569ebc...715516aa - 3 commits from branch dev
    • 0f557c54 - modify confirmation display. Add functions display_output(), display_amount(),...
    • b131671b - Writing tests for tx functions. Apply black on tx.py
    • 83c0a309 - removing display_output_and_amount
    • 6c4404f0 - remove display_output_and_amount() from tests, add transaction_confirmation()...
    • 554f4362 - adding tx parameter in display_pubkey() for Backchange.
    • fd21271a - modify confirmation display. Add functions display_output(), display_amount(),...
    • 9b863222 - Writing tests for tx functions. Apply black on tx.py
    • d186a9d8 - removing display_output_and_amount
    • 05ff453c - remove display_output_and_amount() from tests, add transaction_confirmation()...
    • de5c657a - * make display_amount() lighter and add currency_symbol after "UD"
    • 7f838c7d - can't manage to mock functions
    • c3262cd8 - working tests for tx confirmation with monkeypatch functions

    Compare with previous version

  • matograine added 1 commit

    added 1 commit

    Compare with previous version

  • Moul
  • added Interface label

  • Moul
  • Ok, I think we are almost ready to merge it! You’ll have to rebase it on dev branch. There is an issue with pytest-3.8 job which wasn’t passing.

    Can you make a clean history out of that? With commit messages explaining what are the changes. With the ticket linked (#236 (closed)).

    You can backup your work creating a new branch before changing the history: checkout -b copy_confirmation_display.

    Edited by Moul
  • Moul
  • matograine added 1 commit

    added 1 commit

    Compare with previous version

  • matograine resolved all threads

    resolved all threads

  • matograine added 7 commits

    added 7 commits

    Compare with previous version

  • matograine added 1 commit

    added 1 commit

    Compare with previous version

  • matograine added 2 commits

    added 2 commits

    Compare with previous version

  • matograine unmarked as a Work In Progress

    unmarked as a Work In Progress

  • matograine changed title from WIP : #236 (closed) Confirmation display - good MR to #236 (closed) Confirmation display - good MR

    changed title from WIP : #236 (closed) Confirmation display - good MR to #236 (closed) Confirmation display - good MR

  • Moul
    Moul @moul started a thread on commit ad5e8b06
  • 161 tx.append(
    162 [
    163 "tx amount (unit)",
    164 str(tx_amount / 100 * len(outputAddresses)) + " " + currency_symbol,
    165 ]
    166 )
    167 tx.append(
    168 [
    169 "tx amount (relative)",
    170 str(round(tx_amount / await UDValue().ud_value, 4))
    171 + " UD "
    172 + currency_symbol,
    173 ]
    190
    191 await display_amount(
    192 tx, "total amount", float(tx_amount * len(outputAddresses)), currency_symbol
  • Moul added 2 commits

    added 2 commits

    Compare with previous version

  • merged

  • Please register or sign in to reply
    Loading