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

Fix for displayed service fee in summary #1095

Merged
merged 5 commits into from
Feb 27, 2020
Merged

Fix for displayed service fee in summary #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24551cf
Don't show service fee in summary for direct transfers
nephix Feb 27, 2020
98568b2
Removed unused styling
nephix Feb 27, 2020
1fc4efe
Changelog
nephix Feb 27, 2020
7065ace
Merge branch 'master' into fix/direct-transfer-service-fee
nephix Feb 27, 2020
29f654c
Simplified template
nephix Feb 27, 2020
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
3 changes: 3 additions & 0 deletions raiden-dapp/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
- [#693] Localized error messages for Pathfinding errors.

### Fixed
- [#1067] Fixed displayed service fee on summary screen.


[#1067]: https://github.com/raiden-network/light-client/issues/1067
[#1071]: https://github.com/raiden-network/light-client/issues/1071
[#1015]: https://github.com/raiden-network/light-client/issues/1015
[#695]: https://github.com/raiden-network/light-client/issues/695
Expand Down
5 changes: 1 addition & 4 deletions raiden-dapp/src/components/TransferSummary.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
</span>
</div>

<div
v-if="transfer.serviceFee && transfer.serviceToken"
class="transfer-summary__row"
>
<div v-if="!isDirectTransfer" class="transfer-summary__row">
<span>{{ $t('transfer.steps.summary.service-fee') }}</span>
<span class="transfer-summary__service-fee">
{{
Expand Down
31 changes: 0 additions & 31 deletions raiden-dapp/src/views/TransferSteps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,37 +525,6 @@ export default class TransferSteps extends Mixins(
<style lang="scss" scoped>
@import '../scss/colors';

.confirmation-overlay {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not related, just removed it because it's not used

text-align: center;

&.v-overlay {
&--active {
position: absolute;
top: 0;
bottom: 0;
left: 0;
backdrop-filter: blur(4px);
background-color: rgba($color-white, 0.15);
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}

&--dark {
background-color: $card-background;
}
}

::v-deep {
.spinner {
margin: 2em;
}
}

&__checkmark {
margin: 2em;
}
}

.transfer-steps {
background: transparent !important;
box-shadow: none;
Expand Down