Poll creation modal changes (#27)

packages/react-components/src/WakuPolling/PollCreation.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Wallet } from 'ethers'
 import { JsonRpcSigner } from '@ethersproject/providers'
 import styled from 'styled-components'
@@ -25,65 +25,100 @@ type PollCreationProps = {
 export function PollCreation({ signer, wakuVoting, setShowPollCreation }: PollCreationProps) {
   const [answers, setAnswers] = useState<string[]>(['', ''])
   const [question, setQuestion] = useState('')
+  const [showCreateConfirmation, setShowCreateConfirmation] = useState(false)
   const [selectedType, setSelectedType] = useState(PollType.NON_WEIGHTED)
   const [endTimePicker, setEndTimePicker] = useState(new Date(new Date().getTime() + 10000000))
+  const body = document.getElementById('root')
+
+  useEffect(() => {
+    if (body) {
+      body.style.position = 'fixed'
+      return () => {
+        body.style.position = 'static'
+      }
+    }
+  }, [])
 
   return (
-    <NewPollBoxWrapper onClick={(e) => e.stopPropagation()}>
+    <NewPollBoxWrapper
-      <NewPollBox>
+      onClick={() => {
+        setShowPollCreation(false)
+      }}
+    >
+      <NewPollBox onClick={(e) => e.stopPropagation()}>
         <NewPollBoxTitle>
           Create a poll
           <CloseNewPollBoxButton onClick={() => setShowPollCreation(false)} />
         </NewPollBoxTitle>
-        <PollForm>
+        {!showCreateConfirmation && (
-          <Input
+          <PollForm>
-            label={'Question or title of the poll'}
+            <Input
-            placeholder={'E.g. What is your favourite color?'}
+              label={'Question or title of the poll'}
-            value={question}
+              placeholder={'E.g. What is your favourite color?'}
-            onChange={(e) => setQuestion(e.target.value)}
+              value={question}
-          />
+              onChange={(e) => setQuestion(e.target.value)}
+            />
 
-          <AnswersWraper>
+            <AnswersWraper>
-            {answers.map((answer, idx) => (
+              {answers.map((answer, idx) => (
-              <Input
+                <Input
-                key={idx}
+                  key={idx}
-                label={`Option ${idx + 1}`}
+                  label={`Option ${idx + 1}`}
-                value={answer}
+                  value={answer}
-                onChange={(e) =>
+                  onChange={(e) =>
-                  setAnswers((answers) => {
+                    setAnswers((answers) => {
-                    const newAnswers = [...answers]
+                      const newAnswers = [...answers]
-                    newAnswers[idx] = e.target.value
+                      newAnswers[idx] = e.target.value
-                    return newAnswers
+                      return newAnswers
-                  })
+                    })
-                }
+                  }
-              />
+                />
-            ))}
+              ))}
-          </AnswersWraper>
+            </AnswersWraper>
-          <NewOptionButton
+            <NewOptionButton
-            onClick={(e) => {
+              onClick={(e) => {
-              e.preventDefault()
+                e.preventDefault()
-              setAnswers((answers) => [...answers, ''])
+                setAnswers((answers) => [...answers, ''])
-            }}
+              }}
-          >
+            >
-            Add another option
+              Add another option
-          </NewOptionButton>
+            </NewOptionButton>
-          <SmallButton
+            <SmallButton
-            onClick={async (e) => {
+              onClick={async (e) => {
-              e.preventDefault()
+                e.preventDefault()
-              await wakuVoting?.createTimedPoll(
+                await wakuVoting?.createTimedPoll(
-                signer,
+                  signer,
-                question,
+                  question,
-                answers,
+                  answers,
-                selectedType,
+                  selectedType,
-                undefined,
+                  undefined,
-                endTimePicker.getTime()
+                  endTimePicker.getTime()
-              )
+                )
-              setShowPollCreation(false)
+                setShowCreateConfirmation(true)
-            }}
+              }}
-          >
+            >
-            Create a poll
+              Create a poll
-          </SmallButton>
+            </SmallButton>
-        </PollForm>
+          </PollForm>
+        )}
+
+        {showCreateConfirmation && (
+          <Confirmation>
+            <ConfirmationText>
+              Your poll has been created!
+              <br />
+              It will appear at the top of the poll list.
+            </ConfirmationText>
+            <SmallButton
+              onClick={(e) => {
+                e.preventDefault()
+                setShowPollCreation(false)
+              }}
+            >
+              Close
+            </SmallButton>
+          </Confirmation>
+        )}
       </NewPollBox>
     </NewPollBoxWrapper>
   )
@@ -156,16 +191,20 @@ const NewPollBox = styled.div`
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  width: 468px;
+  max-height: 90vh;
   background-color: white;
+  margin: 20vh auto 2vh;
   padding: 24px 24px 32px;
   box-shadow: 10px 10px 31px -2px #a3a1a1;
   border-radius: 5px;
-  overflow: auto;
+  overflow: scroll;
   z-index: 9998;
   width: 468px;
 
   @media (max-width: 600px) {
     padding: 16px 16px 32px;
+    margin: 0;
   }
 `
 
@@ -175,16 +214,16 @@ const NewPollBoxWrapper = styled.div`
   position: fixed;
   display: flex;
   justify-content: center;
-  align-items: center;
+  align-items: flex-start;
   top: 0;
   left: 0;
   background-color: rgba(0, 0, 0, 0.4);
   z-index: 9999;
   transition: all 0.3s;
-  overflow: auto;
 
   @media (max-width: 600px) {
     padding: 16px;
+    align-items: center;
   }
 `
 const PollForm = styled.form`
@@ -194,3 +233,13 @@ const PollForm = styled.form`
   font-size: 15px;
   line-height: 22px;
 `
+const Confirmation = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+`
+
+const ConfirmationText = styled.div`
+  text-align: center;
+  margin: 32px 0;
+`

packages/react-components/src/WakuPolling/index.tsx

@@ -21,7 +21,7 @@ function WakuPolling({ appName, signer }: WakuPollingProps) {
   }, [])
 
   return (
-    <Wrapper onClick={() => showPollCreation && setShowPollCreation(false)}>
+    <Wrapper>
       {showPollCreation && signer && (
         <PollCreation signer={signer} wakuVoting={wakuVoting} setShowPollCreation={setShowPollCreation} />
       )}