From 3ac93d301a93ff9321c7a5a005919b748da4aba0 Mon Sep 17 00:00:00 2001
From: Andrey Goncharov <aigoncharov@fb.com>
Date: Tue, 10 May 2022 05:13:24 -0700
Subject: [PATCH] Remove optional in plugin init/deinit

Reviewed By: mweststrate

Differential Revision: D35965072

fbshipit-source-id: 0be6b538d371e41b438263a6a4161b079861b293
---
 desktop/flipper-ui-core/src/Client.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/desktop/flipper-ui-core/src/Client.tsx b/desktop/flipper-ui-core/src/Client.tsx
index 25ddaa848..62431c24a 100644
--- a/desktop/flipper-ui-core/src/Client.tsx
+++ b/desktop/flipper-ui-core/src/Client.tsx
@@ -624,16 +624,18 @@ export default class Client extends EventEmitter {
 
   initPlugin(pluginId: string) {
     this.activePlugins.add(pluginId);
-    if (this.connected.get()) {
+    const instance = this.sandyPluginStates.get(pluginId);
+    if (this.connected.get() && instance) {
       this.rawSend('init', {plugin: pluginId});
-      this.sandyPluginStates.get(pluginId)?.connect();
+      instance.connect();
     }
   }
 
   deinitPlugin(pluginId: string) {
     this.activePlugins.delete(pluginId);
-    this.sandyPluginStates.get(pluginId)?.disconnect();
-    if (this.connected.get()) {
+    const instance = this.sandyPluginStates.get(pluginId);
+    instance?.disconnect();
+    if (this.connected.get() && instance) {
       this.rawSend('deinit', {plugin: pluginId});
     }
   }