From 765a5d2deaf95dbd18a3a89c197e47a23d7f6db0 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 27 Mar 2022 15:07:30 +0300
Subject: [PATCH] Chat for finished group + remove Discord prompts

---
 app/components/play/FinishedGroup.tsx | 21 ++++++++++++++++-----
 app/routes/play/match.$id.tsx         |  7 -------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/components/play/FinishedGroup.tsx b/app/components/play/FinishedGroup.tsx
index 0a52d02a7..461b41379 100644
--- a/app/components/play/FinishedGroup.tsx
+++ b/app/components/play/FinishedGroup.tsx
@@ -1,20 +1,31 @@
 import { Form, useLoaderData } from "remix";
-import { DISCORD_URL } from "~/constants";
+import { useUser } from "~/hooks/common";
 import { LookingLoaderData } from "~/routes/play/looking";
+import { isFeatureFlagOn } from "~/utils";
 import { Button } from "../Button";
+import { Chat } from "../Chat";
 import { GroupCard } from "./GroupCard";
 
 export function FinishedGroup() {
   const data = useLoaderData<LookingLoaderData>();
+  const user = useUser();
 
   return (
     <div>
+      {isFeatureFlagOn({ flag: "FF_ENABLE_CHAT", userId: user?.id }) &&
+        data.ownGroup.members && (
+          <Chat
+            id={data.ownGroup.id}
+            users={Object.fromEntries(
+              data.ownGroup.members.map((m) => [
+                m.id,
+                { name: m.discordName, info: m.friendCode },
+              ])
+            )}
+          />
+        )}
       <div className="play-looking__waves">
         <GroupCard group={data.ownGroup} showAction={false} />
-        <div className="play-looking__waves-text">
-          This is your group! You can reach out to them on{" "}
-          <a href={DISCORD_URL}>our Discord</a> in the #group-meetup channel.
-        </div>
       </div>
       <div className="play-looking__waves-button">
         <Form method="post">
diff --git a/app/routes/play/match.$id.tsx b/app/routes/play/match.$id.tsx
index f6bad309f..ebbf999fe 100644
--- a/app/routes/play/match.$id.tsx
+++ b/app/routes/play/match.$id.tsx
@@ -406,13 +406,6 @@ export default function LFGMatchPage() {
               minute: "numeric",
             })}
           </div>
-          {!data.isRanked && (
-            <div className="play-match__waves-section play-match__info">
-              This is your match! You can reach out to your opponents{" "}
-              <a href={DISCORD_URL}>our Discord</a> in the{" "}
-              <code>#match-meetup</code> channel.
-            </div>
-          )}
           {showPlayAgainSection() && (
             <Form method="post">
               <div className="play-match__waves-section play-match__play-again-container">