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

Bugfix/incoming notifications #1637

Merged
merged 3 commits into from
Jun 15, 2020
Merged

Bugfix/incoming notifications #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6757b4e
incoming
estebanmino Jun 15, 2020
1d5099f
take exclamation out
estebanmino Jun 15, 2020
41f5a03
Merge branch 'develop' into bugfix/incoming-notifications
estebanmino Jun 15, 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
10 changes: 6 additions & 4 deletions app/components/UI/Notification/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,23 +463,25 @@ class Notification extends PureComponent {
handleTransactionNotification = () => {
const { status } = this.props;
const { tx, transactionDetailsIsVisible, inBrowserView } = this.state;
const { paymentChannelTransaction } = tx;
const isPaymentChannelTransaction = tx && tx.paymentChannelTransaction;
return (
<ElevatedView
style={[
styles.modalTypeView,
inBrowserView ? styles.modalTypeViewBrowser : {},
transactionDetailsIsVisible && !paymentChannelTransaction ? styles.modalTypeViewDetailsVisible : {}
transactionDetailsIsVisible && !isPaymentChannelTransaction
? styles.modalTypeViewDetailsVisible
: {}
]}
elevation={100}
>
{transactionDetailsIsVisible && !paymentChannelTransaction && this.notificationOverlay()}
{transactionDetailsIsVisible && !isPaymentChannelTransaction && this.notificationOverlay()}
<Animated.View
style={[styles.notificationContainer, { transform: [{ translateY: this.notificationAnimated }] }]}
>
<BaseNotification
status={status}
data={tx.transaction || {}}
data={{ ...tx.transaction, ...this.props.transaction }}
onPress={this.onNotificationPress}
onHide={this.onClose}
/>
Expand Down
2 changes: 1 addition & 1 deletion locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
"success_deposit_title": "Deposit Complete!",
"success_withdrawal_title": "Withdrawal Complete!",
"error_title": "Oops, something went wrong :/",
"received_title": "You received {{amount}} {{assetType}}!",
"received_title": "You received {{amount}} {{assetType}}",
"received_payment_title": "Instant payment received",
"pending_message": "Waiting for confirmation",
"pending_deposit_message": "Waiting for deposit to complete",
Expand Down
2 changes: 1 addition & 1 deletion locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@
"success_deposit_title": "Depósito Completo!",
"success_withdrawal_title": "Retiro Completo!",
"error_title": "Oops, algo ha salido mal :/",
"received_title": "Has recibido {{amount}} {{assetType}}!",
"received_title": "Has recibido {{amount}} {{assetType}}",
"received_payment_title": "Pago instantáneo recibido",
"pending_message": "Tu transacción está en proceso",
"pending_deposit_message": "Esperando que el deposito sea compleado",
Expand Down