Merge pull request #184 from waldo-vision/ts/fix

Attempting ts fix (again)
waldo-vision · Mar 27, 2023 · afd86e2 · afd86e2
2 parents bf18dc3 + a158a09
commit afd86e2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/apps/web/components/TurnstileWidget.tsx b/apps/web/components/TurnstileWidget.tsx
@@ -17,6 +17,8 @@ const TurnstileWidget = (props: WidgetProps) => {
     if (props.refreshState > 0) {
       //@ts-ignore
       ref.current?.reset();
+      //@ts-ignore
+      ref.current?.render();
     }
   }, [props.refreshState]);
   const handleCallback = async (token: string, state: CallbackStates) => {

diff --git a/apps/web/pages/submissions/review.tsx b/apps/web/pages/submissions/review.tsx
@@ -70,10 +70,14 @@ export default function Review() {
   };
 
   const doClickLogic = async (action: 'yes' | 'no') => {
-    if (!reviewItem) return;
+    if (!reviewItem) {
+      setLoading(true);
+      setFinished(true);
+      return;
+    }
     // force update turnstile widget
+    setIsRequestValid(false);
     setRefreshState(refreshState + 1);
-    setLoading(true);
 
     if (!isRequestValid) {
       toast({
@@ -95,6 +99,7 @@ export default function Review() {
       isGame: review,
       tsToken: tsToken as string,
     });
+    setLoading(true);
     await refetch();
     setReviewItem(reviewItemData);
     setLoading(false);
@@ -146,7 +151,7 @@ export default function Review() {
       <Center h={'100vh'} mt={{ base: 5 }}>
         {loading || !reviewItemData || tsToken == '' || tsToken == undefined ? (
           <Flex direction={'column'} alignItems={'center'}>
-            <Spinner color={'purple.500'} size={'xl'} mb={6} />
+            <Spinner size={'xl'} />
             <TurnstileWidget
               valid={(result, token) => {
                 setIsRequestValid(result);
@@ -162,6 +167,13 @@ export default function Review() {
             ) : (
               <>
                 <Center mb={4} display={{ base: 'none', md: 'flex' }}></Center>
+                <TurnstileWidget
+                  valid={(result, token) => {
+                    setIsRequestValid(result);
+                    setTsToken(token);
+                  }}
+                  refreshState={refreshState}
+                />
                 <Box bgColor={'white'} p={6} borderRadius={12}>
                   <Flex direction={'row'}>
                     {/* User Icon */}
@@ -172,6 +184,7 @@ export default function Review() {
                         width={54}
                         height={54}
                         style={{ borderRadius: '100%' }}
+                        onClick={() => setRefreshState(refreshState + 1)}
                       />
                     </Box>
                     {/* Top titles */}
@@ -202,6 +215,8 @@ export default function Review() {
                               ? 'Team Fortress 2'
                               : reviewItem?.gameplayType === 'COD'
                               ? 'Call of Duty'
+                              : reviewItem?.gameplayType === 'R6S'
+                              ? 'Raindbow Six Siege'
                               : 'a relevant First Person Shooter game?'}
                           </Text>
                         </Text>