Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit f19dc58

Browse files
committed
Merge branch 'refs/heads/fix-nav-direction-bugs' into release/desktop
2 parents 1df65e1 + 6e8d021 commit f19dc58

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/action/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NotificationAction {
3030
* @return {undefined}
3131
*/
3232
display({ type, msg, wait, err, handler, handlerLbl }) {
33-
if (err) log.error(msg, err);
33+
if (err) log.info(msg, err);
3434
this._store.notifications.push({
3535
type: type || (err ? 'error' : 'info'),
3636
message: msg,

src/component/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const NotificationBar = ({ notification, display, style }) =>
5454
<Alert type={notification.type} style={barStyles.alert} />
5555
<Text style={barStyles.text}>{notification.message}</Text>
5656
</View>
57-
{notification.handler ? (
57+
{Platform.OS === 'web' && notification.handler ? (
5858
<SmallPillButton
5959
text={notification.handlerLbl}
6060
onPress={notification.handler}

src/view/main-mobile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ const PayStack = createStackNavigator(
215215
{
216216
Pay,
217217
PayLightningConfirm,
218+
Wait,
218219
PayLightningDone,
219220
PaymentFailed,
220221
PayBitcoin,

test/unit/action/notification.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('Action Notification Unit Tests', () => {
3333
handlerLbl: null,
3434
display: true,
3535
});
36-
expect(log.error, 'was not called');
36+
expect(log.info, 'was not called');
3737
await nap(10);
3838
expect(store.notifications[0].display, 'to be', false);
3939
});
@@ -47,7 +47,7 @@ describe('Action Notification Unit Tests', () => {
4747
handlerLbl: null,
4848
display: true,
4949
});
50-
expect(log.error, 'was not called');
50+
expect(log.info, 'was not called');
5151
});
5252

5353
it('create log error', () => {
@@ -59,7 +59,7 @@ describe('Action Notification Unit Tests', () => {
5959
handler,
6060
handlerLbl: 'Fix this',
6161
});
62-
expect(log.error, 'was called with', 'hello', err);
62+
expect(log.info, 'was called with', 'hello', err);
6363
expect(store.notifications[0], 'to satisfy', {
6464
type: 'error',
6565
message: 'hello',

0 commit comments

Comments
 (0)