Support for GV1 -> GV2 migration

2020-11-20 09:30:45 -08:00 · 2020-11-20 09:30:45 -08:00 · 2c69f2c367
commit 2c69f2c367
parent a0baa3e03f
32 changed files with 2626 additions and 341 deletions
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@ -337,8 +337,9 @@ export const CompositionArea = ({
  }, [setLarge]);

  if (
-    messageRequestsEnabled &&
-    (!acceptedMessageRequest || isBlocked || areWePending)
+    isBlocked ||
+    areWePending ||
+    (messageRequestsEnabled && !acceptedMessageRequest)
  ) {
    return (
      <MessageRequestActions