From e83912e44918a3e9301aa6d0bc4b6ccf48eac554 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 18 Sep 2020 10:48:18 +1000
Subject: [PATCH] avatar placeholder skip first 05 for initial from pubkey

---
 ts/components/MessageSearchResult.tsx |  2 +-
 ts/util/getInitials.ts                | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/ts/components/MessageSearchResult.tsx b/ts/components/MessageSearchResult.tsx
index 087e07e73..0a56b0aff 100644
--- a/ts/components/MessageSearchResult.tsx
+++ b/ts/components/MessageSearchResult.tsx
@@ -101,7 +101,7 @@ export class MessageSearchResult extends React.PureComponent<Props> {
 
   public renderAvatar() {
     const { from } = this.props;
-    const userName = from.phoneNumber || from.profileName;
+    const userName = from.profileName || from.phoneNumber;
 
     return (
       <Avatar
diff --git a/ts/util/getInitials.ts b/ts/util/getInitials.ts
index 8f7e30b5e..dd0d62464 100644
--- a/ts/util/getInitials.ts
+++ b/ts/util/getInitials.ts
@@ -1,21 +1,11 @@
-const BAD_CHARACTERS = /[^A-Za-z\s]+/g;
-const WHITESPACE = /\s+/g;
-
-function removeNonInitials(name: string) {
-  return name.replace(BAD_CHARACTERS, '').replace(WHITESPACE, ' ');
-}
-
 export function getInitials(name?: string): string | undefined {
-  if (!name) {
+  if (!name || !name.length) {
     return;
   }
 
-  const cleaned = removeNonInitials(name);
-  const parts = cleaned.split(' ');
-  const initials = parts.map(part => part.trim()[0]);
-  if (!initials.length) {
-    return;
+  if (name.length > 2 && name.startsWith('05')) {
+    return name[2];
   }
 
-  return initials[0];
+  return name[0];
 }