From af89c0b80bef638fa54e59d9a8779b77188cdf96 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 13 Aug 2021 12:04:51 -0500
Subject: [PATCH] about: add firmware version as main version

Since the firmware version is the most important version, make it the
primary version. (We still need the Pybricks Code version since not
every update includes a firmware update.)
---
 CHANGELOG.md              | 2 ++
 src/about/AboutDialog.tsx | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78363600..3886bbad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Changed
 - Checksum is now validated as firmware flash progresses instead of just at the
   end [support#433].
+- About menu now shows firmware version as main version [support#412].
 
 ## [1.1.0-beta.3] - 2021-07-20
 
@@ -60,6 +61,7 @@ Prerelease changes are documented at [support#48].
 [support#375]: https://github.com/pybricks/support/issues/375
 [support#378]: https://github.com/pybricks/support/issues/378
 [support#403]: https://github.com/pybricks/support/issues/403
+[support#412]: https://github.com/pybricks/support/issues/412
 [support#433]: https://github.com/pybricks/support/issues/433
 [v3.0.0]: https://github.com/pybricks/pybricks-micropython/blob/master/CHANGELOG.md#300---2021-06-08
 [v3.1.0a1]: https://github.com/pybricks/pybricks-micropython/blob/master/CHANGELOG.md#310a1---2021-06-23
diff --git a/src/about/AboutDialog.tsx b/src/about/AboutDialog.tsx
index ed60bc38..29427054 100644
--- a/src/about/AboutDialog.tsx
+++ b/src/about/AboutDialog.tsx
@@ -4,6 +4,7 @@
 // The about dialog
 
 import { AnchorButton, Button, Classes, Dialog } from '@blueprintjs/core';
+import { firmwareVersion } from '@pybricks/firmware';
 import { WithI18nProps, withI18n } from '@shopify/react-i18n';
 import React from 'react';
 import { connect } from 'react-redux';
@@ -35,7 +36,7 @@ class AboutDialog extends React.Component<AboutDialogProps> {
         const { isOpen, onClose, i18n } = this.props;
         return (
             <Dialog
-                title={`${appName} v${appVersion}`}
+                title={`Pybricks v${firmwareVersion} (${appName} v${appVersion})`}
                 isOpen={isOpen}
                 onClose={() => onClose()}
             >