Merge pull request #2429 from MartinFournier/fix/export-bonus

Fix export bonus not being applied when using options menu

src/ui/GameRoot.tsx

@@ -389,7 +389,11 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
                   <GameOptionsRoot
                     player={player}
                     save={() => saveObject.saveGame()}
-                    export={() => saveObject.exportGame()}
+                    export={() => {
+                      // Apply the export bonus before saving the game
+                      onExport(player);
+                      saveObject.exportGame()
+                    }}
                     forceKill={killAllScripts}
                     softReset={() => {
                       dialogBoxCreate("Soft Reset!");
@@ -400,8 +404,9 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
                 ) : page === Page.Augmentations ? (
                   <AugmentationsRoot
                     exportGameFn={() => {
-                      saveObject.exportGame();
+                      // Apply the export bonus before saving the game
                       onExport(player);
+                      saveObject.exportGame();
                     }}
                     installAugmentationsFn={() => {
                       installAugmentations();

src/ui/React/GameOptionsRoot.tsx

@@ -246,16 +246,14 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
         return;
       }
 
-
       const data: ImportData = {
         base64: contents,
         parsed: parsedSave,
       }
 
-      // We don't always seem to have this value in the save file. Exporting from the option menu does not set the bonus I think.
-      const exportTimestamp = parsedSave.data.LastExportBonus;
-      if (exportTimestamp && exportTimestamp !== '0') {
-        data.exportDate = new Date(parseInt(exportTimestamp, 10))
+      const timestamp = parsedSave.data.SaveTimestamp;
+      if (timestamp && timestamp !== '0') {
+        data.exportDate = new Date(parseInt(timestamp, 10))
       }
 
       setImportData(data)