Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
(fix) boost peer rejected missing space
· 5b85b1cf
Martin Santangelo
authored
Dec 26, 2019
5b85b1cf
Merge branch 'fix/missing-space-peer-boost-rejected-notif' into 'release/3.15.0'
· fadc101a
Brian Hatchet
authored
Jan 03, 2020
Fix boost peer rejected missing space See merge request
!469
fadc101a
Hide whitespace changes
Inline
Side-by-side
__tests__/notifications/notification/__snapshots__/Notification.js.snap
View file @
fadc101a
...
...
@@ -492,6 +492,7 @@ exports[`notification component renders correctly for every type 5`] = `
some title
</Text>
</Text>
You have not been charged
</Text>
</View>
...
...
__tests__/notifications/notification/view/__snapshots__/BoostPeerRejectedView.js.snap
View file @
fadc101a
...
...
@@ -52,6 +52,7 @@ exports[`renders correctly 1`] = `
some title
</Text>
</Text>
You have not been charged
</Text>
</View>
...
...
src/notifications/notification/view/BoostPeerAcceptedView.js
View file @
fadc101a
...
...
@@ -35,14 +35,14 @@ export default class BoostPeerAcceptedView extends BoostGiftView {
}
getType
()
{
return
(
this
.
props
.
entity
.
params
.
type
==
'
pro
'
)
?
i18n
.
t
(
'
usd
'
)
:
i18n
.
t
(
'
tokens
'
);
return
(
this
.
props
.
entity
.
params
.
type
==
=
'
pro
'
)
?
i18n
.
t
(
'
usd
'
)
:
i18n
.
t
(
'
tokens
'
);
}
getAmount
()
{
if
(
this
.
props
.
entity
.
params
.
type
==
'
pro
'
)
{
if
(
this
.
props
.
entity
.
params
.
type
==
=
'
pro
'
)
{
return
this
.
props
.
entity
.
params
.
bid
;
}
else
{
return
number
(
token
(
this
.
props
.
entity
.
params
.
bid
,
18
),
0
,
3
)
return
number
(
token
(
this
.
props
.
entity
.
params
.
bid
,
18
),
0
,
3
)
;
}
}
}
\ No newline at end of file
}
src/notifications/notification/view/BoostPeerRejectedView.js
View file @
fadc101a
...
...
@@ -26,10 +26,9 @@ export default class BoostPeerRejectedView extends BoostPeerAcceptedView {
return
(
<
View
style
=
{
styles
.
bodyContents
}
>
<
Text
onPress
=
{()
=>
this
.
navToBoostConsole
({
filter
:
'
peer
'
})}
>
<
Text
style
=
{
styles
.
bold
}
onPress
=
{
this
.
navToChannel
}
>
@{
entity
.
from
.
username
}
<
/Text> {i18n.t
(
'notification.boostPeerRejected'
)
} <Text style={styles.bold}>{amount} {type}</
Text
>
{
description
}
{
i18n
.
t
(
'
notification.notCharged
'
)}
<
Text
style
=
{
styles
.
bold
}
onPress
=
{
this
.
navToChannel
}
>
@{
entity
.
from
.
username
}
<
/Text> {i18n.t
(
'notification.boostPeerRejected'
)
} <Text style={styles.bold}>{amount} {type}</
Text
>
{
description
}
{
i18n
.
t
(
'
notification.notCharged
'
)}
<
/Text
>
<
/View
>
)
)
;
}
}
\ No newline at end of file
}
src/notifications/notification/view/BoostRejectedView.js
View file @
fadc101a
...
...
@@ -4,7 +4,7 @@ import React, {
import
{
Text
,
View
View
,
}
from
'
react-native
'
;
import
BoostGiftView
from
'
./BoostGiftView
'
;
...
...
@@ -34,6 +34,6 @@ export default class BoostRejectedView extends BoostGiftView {
<
View
style
=
{
styles
.
bodyContents
}
>
<
Text
onPress
=
{
this
.
navToBoostConsole
}
>
{
i18n
.
to
(
'
notification.boostRejected
'
,
{
reason
},
{
description
})}
<
/Text
>
<
/View
>
)
)
;
}
}
\ No newline at end of file
}