Merge branch 'hotfix/0.7.2'

cere-io · Oct 4, 2023 · b983954 · b983954
2 parents 26541b3 + 4ca0f82
commit b983954
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 -
 
+### v0.7.2
+
+- Added plural versions of the words
+- Fixed tournament dayDifference
+
 ### v0.7.1
 
 - Added utm parameter in tweet

diff --git a/lerna.json b/lerna.json
@@ -1,3 +1,3 @@
 {
-  "version": "0.7.1"
+  "version": "0.7.2"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cere/eslint-config-games-sdk",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "index.js",
   "private": true,
   "dependencies": {

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cere/games-sdk",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Cere Games SDK to integrate games with CERE infrastructure",
   "sideEffects": false,
   "main": "dist/bundle.umd.js",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@cere/embed-wallet": "0.12.0",
-    "@cere/games-sdk-ui": "0.7.1",
+    "@cere/games-sdk-ui": "0.7.2",
     "react-gtm-module": "^2.0.11"
   },
   "devDependencies": {

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cere/games-sdk-ui",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Cere Games SDK UI Elements",
   "sideEffects": false,
   "main": "dist/bundle.umd.js",

diff --git a/packages/ui/src/widgets/Leaderboard/Leaderboard.tsx b/packages/ui/src/widgets/Leaderboard/Leaderboard.tsx
@@ -107,7 +107,7 @@ export const Leaderboard = ({
     const tournamentEndDate = new Date(activeTournament.endDate);
     const dateNow = new Date();
     const diffInTime = tournamentEndDate.getTime() - dateNow.getTime();
-    return Math.ceil(Math.abs(diffInTime / (1000 * 3600 * 24)));
+    return diffInTime > 0 ? Math.ceil(Math.abs(diffInTime / (1000 * 3600 * 24))) : 0;
   }, [activeTournament]);
 
   return (
@@ -126,7 +126,7 @@ Be a top 3 player to win a prize"
           hasActiveTournament={Boolean(activeTournament)}
           tournamentTitle={`${activeTournament ? activeTournament.title : 'Weekly tournament'}`}
           tournamentSubtitle={activeTournament ? activeTournament.subtitle : 'TOP 20 WINS UNIQUE NFT'}
-          amountOfDaysLeft={dayDifference ? dayDifference : 1}
+          amountOfDaysLeft={Boolean(dayDifference) ? dayDifference : 0}
           onPlayAgain={handlePlayAgain}
           onTweet={onTweet}
           disabled={balance < sessionPrice}

diff --git a/packages/ui/src/widgets/Leaderboard/TopWidget.tsx b/packages/ui/src/widgets/Leaderboard/TopWidget.tsx
@@ -35,6 +35,7 @@ const DaysLeft = styled.div(({ tournament }: { tournament?: boolean }) => ({
   borderRadius: 8,
   fontWeight: 600,
   fontSize: 14,
+  whiteSpace: 'nowrap',
   display: 'none',
   textAlign: 'center',
   minWidth: 168,
@@ -228,16 +229,24 @@ export const TopWidget = ({
     window.open(`https://twitter.com/intent/tweet?${tweetBody}`, '_system', 'width=600,height=600');
   }, [address, gameInfo.name, gameInfo.tags, onTweet, score]);
 
+  const pluralizeWord = (singularWord: string, pluralWord: string, count: number) => {
+    return count > 1 || count === 0 ? pluralWord : singularWord;
+  };
+
   return (
     <WidgetWrapper layer={`${cdnUrl}/assets/layer.svg`} padding={[3, 3, 3, 3]} tournament={hasActiveTournament}>
       <RadialGradientBackGround />
       <Content>
         <>
           <UniqueNFT align="center" tournament>
-            {tournamentSubtitle}
+            {amountOfDaysLeft === 0 ? 'Sorry, this tournament is over' : tournamentSubtitle}
           </UniqueNFT>
-          <Typography align="center">{tournamentTitle}</Typography>
-          <DaysLeft tournament={hasActiveTournament}>{amountOfDaysLeft} day left</DaysLeft>
+          <Typography align="center">
+            {amountOfDaysLeft === 0 ? 'Keep playing to practice for the next one' : tournamentTitle}
+          </Typography>
+          <DaysLeft tournament={hasActiveTournament}>
+            {amountOfDaysLeft} {pluralizeWord('day', 'days', amountOfDaysLeft)} left
+          </DaysLeft>
           <RewardsRow>
             <RewardColumn>
               <span>1st prize</span>

diff --git a/playground/package.json b/playground/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@cere-games-sdk/playground",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "private": true,
   "scripts": {
     "start": "craco start"
   },
   "dependencies": {
-    "@cere/games-sdk": "0.7.1",
+    "@cere/games-sdk": "0.7.2",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mui/lab": "^5.0.0-alpha.119",

diff --git a/tests/wdio/package.json b/tests/wdio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cere-games-sdk/wdio",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "private": true,
   "scripts": {
     "start": "wdio run ./wdio.conf.ts",

diff --git a/web/package.json b/web/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@cere-games-sdk/web",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "private": true,
   "scripts": {
     "start": "webpack serve --open /examples",
     "bundle": "webpack"
   },
   "dependencies": {
-    "@cere/games-sdk": "0.7.1"
+    "@cere/games-sdk": "0.7.2"
   },
   "devDependencies": {
     "copy-webpack-plugin": "^11.0.0",