Merge remote-tracking branch 'origin/9-2024-bug-fixes-updates' into 9…

…-2024-bug-fixes-updates
Chia-Network · Sep 26, 2024 · 86a1f27 · 86a1f27
2 parents cb3ca5d + b36da10
commit 86a1f27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/renderer/pages/MyProjectsPage.tsx b/src/renderer/pages/MyProjectsPage.tsx
@@ -134,7 +134,7 @@ const MyProjectsPage: React.FC = () => {
 
           {myOrganization && <ProjectXlsUploadDownloadButtons orgUid={orgUid} order={order} search={search} />}
           <SyncIndicator detailed={true} orgUid={orgUid} />
-          {orgUid && <OrgUidBadge orgUid={orgUid} registryId={organizationsMap?.[orgUid].registryId} />}
+          {orgUid && <OrgUidBadge orgUid={orgUid} registryId={organizationsMap?.[orgUid]?.registryId} />}
         </div>
         <div className="h-13">
           <Tabs onActiveTabChange={(tab: TabTypes) => setActiveTab(tab)}>
@@ -167,7 +167,7 @@ const MyProjectsPage: React.FC = () => {
               title={
                 <p>
                   <FormattedMessage id="transfer" />
-                  {(processedStagingData.transfer || importedTransferOfferData) && ' (!) '}
+                  {(processedStagingData.transfer || importedTransferOfferData?.changes) && ' (!) '}
                 </p>
               }
             />

diff --git a/vite.config.ts b/vite.config.ts
@@ -4,7 +4,7 @@ import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: './', 
+  base: './',
   plugins: [react()],
   resolve: {
     alias: {
@@ -15,4 +15,7 @@ export default defineConfig({
     // Specify the directory to output the build files
     outDir: path.resolve(__dirname, 'build/renderer'),
   },
+  server: {
+    port: 5173,
+  },
 });