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

Jump to bottom

Benji/ext issue 29 calculate subtotal in SessionApprove TableInvoice #2787

Merged
merged 16 commits into from
Jul 4, 2019
Merged

Benji/ext issue 29 calculate subtotal in SessionApprove TableInvoice #2787

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bcada60
Adds TableInvoice to SessionApprove with Amount and estimateFee
thebkr7 Jun 28, 2019
5351b24
Merge branch 'chrome-extension' into Benji/Ext-issue-29-Calculate-Sub…
thebkr7 Jun 28, 2019
1dda831
Moves logic to computed property
thebkr7 Jun 28, 2019
1e6fd8e
changelog
thebkr7 Jun 28, 2019
7226500
Updates fees and amount in SessionApprove
thebkr7 Jul 2, 2019
9d1a96d
Update to wrong work committed
thebkr7 Jul 2, 2019
a854bc9
Updates data structure parsing
thebkr7 Jul 2, 2019
a01314d
Adds scripts/parsers.js as a helper to SessionApprove
thebkr7 Jul 2, 2019
ca7cdb0
Bringing branch up to date with develop
thebkr7 Jul 3, 2019
48dc12b
Updates parser to handle different data structures
thebkr7 Jul 3, 2019
5c7473c
fixed signMessage being undefined
faboweb Jul 4, 2019
c85ac23
fixed sign message issue in tests
faboweb Jul 4, 2019
bdd084e
reduce JSON.parse
faboweb Jul 4, 2019
92309f6
reduced parsing
faboweb Jul 4, 2019
0754d8d
Creates tests for Parsers
thebkr7 Jul 4, 2019
a715d43
Adds a test for the conditional in parsers
thebkr7 Jul 4, 2019
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
1 change: 1 addition & 0 deletions changes/Benji_Ext-issue-29-Calculate-Subtotal-in-Approve-TableInvoice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[Code Improvements] [#2785](https://github.com/cosmos/lunie/pull/2785) Refactors SessionApprove to pass TableInvoice the subtotal fee and amount of the transaction. TableInvoice was refactored in PR #2785 @thebkr7
14 changes: 10 additions & 4 deletions src/components/common/SessionApprove.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
From
<Bech32 :address="senderAddress" />
</div>

<!-- <TableInvoice :fees="fees" /> -->

<TableInvoice :amount="amount" :estimated-fee="fees" />
<TmFormGroup
:error="$v.password.$error && $v.password.$invalid"
class="action-modal-group"
Expand Down Expand Up @@ -89,6 +87,11 @@ function parseTx(signMessage) {
}
}

function parseFee(message) {
thebkr7 marked this conversation as resolved.
Show resolved Hide resolved
const { fee } = JSON.parse(message)
return Number(fee.amount[0].amount)
}

export default {
name: `session-ext-approve-tran`,
components: {
Expand All @@ -110,10 +113,13 @@ export default {
return this.signRequest ? parseTx(this.signRequest.signMessage) : null
},
fees() {
return this.tx ? this.tx.tx.value.fee.amount : null
return this.signRequest ? parseFee(this.signRequest.signMessage) : null
thebkr7 marked this conversation as resolved.
Show resolved Hide resolved
},
senderAddress() {
return this.signRequest ? this.signRequest.senderAddress : null
},
amount() {
return Number(this.tx.tx.value.msg[0].value.amount[0].amount)
}
},
methods: {
Expand Down