From c1d6e6113fb20543cdb32ce3e1da879afbf65410 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Fri, 17 Aug 2018 16:12:14 +1000
Subject: [PATCH] ValidateNumber now accepts pubkeys instead of phone numbers.
 This allows starting a conversation with a pubkey.

---
 js/models/conversations.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index d1af016a3..926807405 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -645,14 +645,13 @@
 
     validateNumber() {
       if (this.isPrivate()) {
-        const regionCode = storage.get('regionCode');
-        const number = libphonenumber.util.parseNumber(this.id, regionCode);
-        if (number.isValidNumber) {
-          this.set({ id: number.e164 });
+        if (StringView.base64ToBytes(this.id).byteLength == 33)
+        {
+          this.set({ id: this.id });
           return null;
         }
 
-        return number.error || 'Invalid phone number';
+        return 'Invalid ID';
       }
 
       return null;