From e7bb5dd7f115e2ced523d7ea54c29e7875b1b67f Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Wed, 27 Sep 2017 17:38:45 -0400
Subject: [PATCH] ui/ux: fix username appearance
This patch displays ringID if username is empty string
Change-Id: Ib1c7f261e5242f55783f3d462e75eef73e89e7ec
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
---
.../Features/ContactRequests/ContactRequestsViewModel.swift | 2 +-
.../Conversations/Conversation/ConversationViewModel.swift | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift b/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
index 747eb1ba6..67b02ab9d 100644
--- a/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
+++ b/Ring/Ring/Features/ContactRequests/ContactRequestsViewModel.swift
@@ -95,7 +95,7 @@ class ContactRequestsViewModel: ViewModel {
return lookupNameResponse.address == item.contactRequest.ringId
})
.subscribe(onNext: { lookupNameResponse in
- if lookupNameResponse.state == .found {
+ if lookupNameResponse.state == .found && !lookupNameResponse.name.isEmpty {
item.userName.value = lookupNameResponse.name
} else {
item.userName.value = lookupNameResponse.address
diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
index 11516fccd..4cfd2b82f 100644
--- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
+++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift
@@ -103,7 +103,7 @@ class ConversationViewModel: ViewModel {
return lookupNameResponse.address != nil &&
lookupNameResponse.address == recipientRingId
}).subscribe(onNext: { [unowned self] lookupNameResponse in
- if let name = lookupNameResponse.name {
+ if let name = lookupNameResponse.name, !name.isEmpty {
self.userName.onNext(name)
contact?.userName = name
} else if let address = lookupNameResponse.address {
--
GitLab