Fixes frontend according to new contract changes

gear-foundation · Aug 29, 2023 · 73eb8c4 · 73eb8c4
1 parent d33f001
commit 73eb8c4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/frontend/src/features/session/components/radar/Radar.tsx b/frontend/src/features/session/components/radar/Radar.tsx
@@ -15,6 +15,7 @@ type Props = {
 };
 
 function Radar({ currentEvents, currentRound, roundsCount, isWinner, userRank, reward }: Props) {
+  console.log(roundsCount);
   const getPlayers = () =>
     currentEvents?.map(({ participant, deadRound }, index) => {
       const playerNumber = index + 1;

diff --git a/frontend/src/features/session/components/session/Session.tsx b/frontend/src/features/session/components/session/Session.tsx
@@ -33,7 +33,7 @@ function Session({ session, turns, rankings, userId }: Props) {
   const lastPage = () => setRoundIndex(roundsCount - 1);
 
   const getEvents = (): Event[] =>
-    turns[roundIndex].map((participantInfo) => {
+    turns?.[roundIndex]?.map((participantInfo) => {
       const isAlive = Object.keys(participantInfo[1])[0] === 'Alive';
 
       return {
@@ -49,7 +49,7 @@ function Session({ session, turns, rankings, userId }: Props) {
     });
 
   const getFeedItems = () =>
-    getEvents().map(({ participant, halt, payload, lastAltitude, fuelLeft, deadRound }, index) => (
+    getEvents()?.map(({ participant, halt, payload, lastAltitude, fuelLeft, deadRound }, index) => (
       <li key={participant} className={styles.item} style={{ '--color': PLAYER_COLORS[index] } as CSSProperties}>
         <h3 className={styles.heading}>{participant}</h3>
         <div className={styles.bodyItem}>
@@ -120,9 +120,9 @@ function Session({ session, turns, rankings, userId }: Props) {
         currentEvents={getEvents()}
         currentRound={roundIndex}
         roundsCount={roundsCount}
-        isWinner={userId === sortRanks()[0][0]}
-        reward={(rankings.find((rank) => rank[0] === userId) as Rank)[1]}
-        userRank={sortRanks().findIndex((rank) => rank[0] === userId) + 1}
+        isWinner={userId === sortRanks()?.[0]?.[0]}
+        reward={(rankings?.find((rank) => rank[0] === userId) as Rank)?.[1]}
+        userRank={sortRanks()?.findIndex((rank) => rank[0] === userId) || 0 + 1}
       />
     </div>
   );

diff --git a/frontend/src/features/session/components/start/Start.tsx b/frontend/src/features/session/components/start/Start.tsx
@@ -39,7 +39,7 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
   const setCurrentContractAddress = useSetAtom(CURRENT_CONTRACT_ADDRESS_ATOM);
   const setIsContractAddressInitialized = useSetAtom(IS_CONTRACT_ADDRESS_INITIALIZED_ATOM);
   const { altitude, weather, fuelPrice, reward, sessionId } = session;
-  const playersCount = participants?.length ? participants.length : 1;
+  const playersCount = participants?.length ? participants.length + 1 : 1;
   const isRegistered = decodedAddress ? !!participants.some((participant) => participant[0] === decodedAddress) : false;
 
   const containerClassName = clsx(styles.container, decodedAddress ? styles.smallMargin : styles.largeMargin);
@@ -49,7 +49,6 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
   >('registration');
 
   const meta = useEscrowMetadata();
-
   const getDecodedPayload = (payload: Vec<u8>) => {
     if (meta?.types.handle.output) {
       return meta.createType(meta.types.handle.output, payload).toHuman();
@@ -75,7 +74,7 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
 
     if (isOwner && isEscrowProgram) {
       const reply = getDecodedReply(payload);
-
+      // console.log(reply);
       if (reply?.Err) {
         if (reply.Err === 'NotEnoughParticipants' || reply.Err === 'MaximumPlayersReached') {
           setRegistrationStatus(reply.Err);
@@ -101,7 +100,7 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
   }, [api, decodedAddress, meta]);
 
   useEffect(() => {
-    if (registrationStatus === 'NotEnoughParticipants' && participants.length > 1) {
+    if (registrationStatus === 'NotEnoughParticipants' && participants.length) {
       setRegistrationStatus('registration');
     }
   }, [participants, registrationStatus]);
@@ -140,7 +139,7 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
 
           <footer>
             {isRegistered && !isUserAdmin && <SuccessfullyRegisteredInfo />}
-            {isRegistered &&
+            {!participants.length &&
               isUserAdmin &&
               registrationStatus === 'NotEnoughParticipants' &&
               participants.length < 2 && (
@@ -158,7 +157,8 @@ function Start({ participants, session, isUserAdmin, userAddress }: Props) {
             {!isRegistered && registrationStatus === 'error' && !isUserAdmin && (
               <Warning title="Error" text="Please try again later or choose another contract address." />
             )}
-            {((isUserAdmin && registrationStatus !== 'NotEnoughParticipants') || (!isUserAdmin && !isRegistered && registrationStatus === 'registration')) && (
+            {((isUserAdmin && registrationStatus !== 'NotEnoughParticipants') ||
+              (!isUserAdmin && !isRegistered && registrationStatus === 'registration')) && (
               <Form
                 weather={weather}
                 defaultDeposit={withoutCommas('0')}

diff --git a/frontend/src/features/session/components/table/Table.tsx b/frontend/src/features/session/components/table/Table.tsx
@@ -21,7 +21,7 @@ function Table({ data, userId }: Props) {
     ));
 
   const getBody = () =>
-    data.map(({ participant, deadRound, fuelLeft, lastAltitude, payload, halt }, index) => (
+    data?.map(({ participant, deadRound, fuelLeft, lastAltitude, payload, halt }, index) => (
       <Fragment key={participant}>
         <div
           className={cx(styles.bodyCell, styles.firstColumn)}

diff --git a/frontend/src/pages/home/Home.tsx b/frontend/src/pages/home/Home.tsx
@@ -16,16 +16,15 @@ function Home() {
   const { sessionId, altitude, weather, fuelPrice, reward } = session || {};
 
   const isUserAdmin = admin === account?.decodedAddress;
-  const doesSessionExist = !!isSessionEnded;
   const isStateComing = !!state;
-
+  console.log(state);
   return (
     <>
-      {!isContractAddressInitialized && (
+      {(!isContractAddressInitialized || (!Number(sessionId) && isSessionEnded)) && (
         <Welcome>
           {account ? (
             <EnterContractAddress
-              doesSessionExist={doesSessionExist}
+              doesSessionExist={!isSessionEnded}
               isUserAdmin={isUserAdmin}
               isStateComing={isStateComing}
             />