test

test pr

.github/workflows/firebase-release.yml

@@ -1,59 +1,58 @@
-name: Deploy to Firebase Hosting on merge
+name: Deploy to Firebase Hosting
 'on':
   push:
     tags:
       - '*'
 jobs:
-  # build_and_deploy:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     REPO_READ_ACCESS_TOKEN: ${{ secrets.REPO_READ_ACCESS_TOKEN }}
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    env:
+      REPO_READ_ACCESS_TOKEN: ${{ secrets.REPO_READ_ACCESS_TOKEN }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-  #     - name: Setup bun
-  #       uses: oven-sh/setup-bun@v1
+      - name: Setup bun
+        uses: oven-sh/setup-bun@v1
 
-  #     - name: Build, lint, and deploy
-  #       run: |
-  #         bun install
-  #         bun run build
-  #         bun run lint
-  #     - name: Deploy to Firebase Hosting
-  #       uses: FirebaseExtended/action-hosting-deploy@v0
-  #       with:
-  #         repoToken: '${{ secrets.GITHUB_TOKEN }}'
-  #         firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}'
-  #         channelId: live
-  #         projectId: life-trinket
+      - name: Build, lint, and deploy
+        run: |
+          bun install
+          bun run build
+          bun run lint
+      - name: Deploy to Firebase Hosting
+        uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}'
+          channelId: live
+          projectId: life-trinket
 
   release:
-    # needs: build_and_deploy
+    needs: build_and_deploy
     runs-on: ubuntu-latest
+    env:
+      working-directory: ${{ github.workspace }}
     steps:
-      - name: Extract version from package.json
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: get version
         id: version
-        run: echo "::set-output name=version::$(jq -r .version package.json)"
+        uses: notiz-dev/github-action-json-property@v0.2.0
+
+        with:
+          path: 'package.json'
+          prop_path: 'version'
 
       - name: Create Release Note
         id: create_release_note
-        run: echo "Release Note for version ${{ steps.version.outputs.version }}" > release_note.txt
-
-      # - name: Release
-      #   uses: 'marvinpinto/action-automatic-releases@latest'
-      #   with:
-      #     repo_token: '${{ secrets.RELEASE_TOKEN }}'
-      #     automatic_release_tag: 'latest'
-      #     prerelease: true
-      #     title: ${{ steps.version.outputs.version }}
-      #     files: release_note.txt
+        run: echo "Release Note for version ${{ steps.version.outputs.prop }}" > release_note.txt
 
       - name: Create Release
         uses: ncipollo/release-action@v1.13.0
         with:
-          artifacts: 'path/to/artifact.tar.gz,another/path/to/artifact.txt' # Add your artifact paths
-          body: 'Release notes for version ${{ steps.version.outputs.version }}' # Customize your release notes
-          commit: ${{ github.sha }} # Use the commit hash of the current workflow run
-          tag: '${{ steps.version.outputs.version }}' # Specify the tag for the release
-          token: ${{ secrets.RELEASE_TOKEN }} # GitHub token for authentication
+          bodyFile: release_note.txt
+          commit: ${{ github.sha }}
+          tag: '${{ steps.version.outputs.prop }}'
+          token: ${{ secrets.RELEASE_TOKEN }}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "life-trinket",
   "private": true,
-  "version": "0.5.1",
+  "version": "0.5.44",
   "type": "commonjs",
   "engines": {
     "node": ">=18",

src/Components/Misc/SettingsModal.tsx

@@ -4,7 +4,7 @@ import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
 import { ModalWrapper } from './InfoModal';
 import { Separator } from './Separator';
 import { Paragraph } from './TextComponents';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 const SettingContainer = twc.div`w-full flex flex-col`;
 
@@ -22,7 +22,7 @@ type SettingsModalProps = {
 export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
   const { settings, setSettings, isPWA } = useGlobalSettings();
   const [isLatestVersion, setIsLatestVersion] = useState(false);
-  const newVersion = useRef<string | undefined>(undefined);
+  const [newVersion, setNewVersion] = useState<string | undefined>(undefined);
 
   useEffect(() => {
     if (!isOpen) {
@@ -43,18 +43,22 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
         );
         const data = await result.json();
 
+        console.info('liveVersion', data.name);
+
         if (!data.name) {
+          setNewVersion(undefined);
           setIsLatestVersion(false);
-          newVersion.current = undefined;
           return;
         }
 
+        setNewVersion(data.name);
+
         /* @ts-expect-error is defined in vite.config.ts*/
         if (data.name === APP_VERSION) {
-          newVersion.current = data.name;
           setIsLatestVersion(true);
           return;
         }
+
         setIsLatestVersion(false);
       } catch (error) {
         console.error('error getting latest version string', error);
@@ -147,13 +151,13 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
                 <span className="text-sm text-text-secondary">(latest)</span>
               )}
             </Paragraph>
-            {!isLatestVersion && newVersion.current && (
+            {!isLatestVersion && newVersion && (
               <Paragraph className="text-text-secondary text-lg text-center">
-                New version ({newVersion.current}) is available!{' '}
+                New version ({newVersion}) is available!{' '}
               </Paragraph>
             )}
           </SettingContainer>
-          {!isLatestVersion && newVersion.current && (
+          {!isLatestVersion && newVersion && (
             <Button
               variant="contained"
               style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }}