Skip to content

Commit

Permalink
[FIX] Empty room name for livechat (#375)
Browse files Browse the repository at this point in the history
<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
@RocketChat/reactnative

<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
Closes #320 
Closes #209 

<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
  • Loading branch information
diegolmello authored and ggazzo committed Jul 20, 2018
1 parent 8c2b715 commit 2a837cb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/lib/methods/helpers/mergeSubscriptionsRooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ export const merge = (subscription, room) => {
subscription.notifications = false;
}

if (!subscription.name) {
subscription.name = subscription.fname;
}

subscription.blocker = !!subscription.blocker;
subscription.blocked = !!subscription.blocked;
return subscription;
Expand Down

0 comments on commit 2a837cb

Please sign in to comment.