From 284ec8a74f6f515b3cb0a6597faca2fea22dc78d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 31 Aug 2021 16:11:31 +0100
Subject: [PATCH 1/2] Check for null keys in settings view model

The keys to format in the settings view model might be null. This avoid crashing
the UI by testing for this case.
---
 src/domain/session/settings/SettingsViewModel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/domain/session/settings/SettingsViewModel.js b/src/domain/session/settings/SettingsViewModel.js
index 7120f5fb..1f676bb3 100644
--- a/src/domain/session/settings/SettingsViewModel.js
+++ b/src/domain/session/settings/SettingsViewModel.js
@@ -28,6 +28,9 @@ class PushNotificationStatus {
 }
 
 function formatKey(key) {
+    if (!key) {
+        return null;
+    }
     const partLength = 4;
     const partCount = Math.ceil(key.length / partLength);
     let formattedKey = "";

From 3e5cc07440601b2f83659dd4de1764e9b3a5d720 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 31 Aug 2021 17:14:14 +0100
Subject: [PATCH 2/2] Move check to fingerprintKey

---
 src/domain/session/settings/SettingsViewModel.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/domain/session/settings/SettingsViewModel.js b/src/domain/session/settings/SettingsViewModel.js
index 1f676bb3..ddb9ac47 100644
--- a/src/domain/session/settings/SettingsViewModel.js
+++ b/src/domain/session/settings/SettingsViewModel.js
@@ -28,9 +28,6 @@ class PushNotificationStatus {
 }
 
 function formatKey(key) {
-    if (!key) {
-        return null;
-    }
     const partLength = 4;
     const partCount = Math.ceil(key.length / partLength);
     let formattedKey = "";
@@ -80,7 +77,11 @@ export class SettingsViewModel extends ViewModel {
     }
 
     get fingerprintKey() {
-        return formatKey(this._session.fingerprintKey);
+        const key = this._session.fingerprintKey;
+        if (!key) {
+            return null;
+        }
+        return formatKey(key);
     }
 
     get deviceId() {