From 4c097d89c5e0354a2090bd7440a7a815cecb9fdc Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Tue, 6 Dec 2022 12:40:40 -0600
Subject: [PATCH] Add build version to menu

---
 ios/Podfile.lock                 |  6 ++++++
 package.json                     |  1 +
 src/view/com/util/UserAvatar.tsx |  2 +-
 src/view/com/util/UserBanner.tsx |  2 +-
 src/view/screens/Menu.tsx        | 14 +++++++++++++-
 yarn.lock                        |  5 +++++
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 182ceab758..74384f60d1 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -232,6 +232,8 @@ PODS:
     - ReactCommon/turbomodule/core
   - react-native-splash-screen (3.3.0):
     - React-Core
+  - react-native-version-number (0.3.6):
+    - React
   - React-perflogger (0.68.2)
   - React-RCTActionSheet (0.68.2):
     - React-Core/RCTActionSheetHeaders (= 0.68.2)
@@ -375,6 +377,7 @@ DEPENDENCIES:
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
+  - react-native-version-number (from `../node_modules/react-native-version-number`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -449,6 +452,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
+  react-native-version-number:
+    :path: "../node_modules/react-native-version-number"
   React-perflogger:
     :path: "../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
@@ -517,6 +522,7 @@ SPEC CHECKSUMS:
   react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605
   react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
+  react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
   React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6
   React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162
   React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034
diff --git a/package.json b/package.json
index 3e0afb334b..5b67d044a5 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "react-native-svg": "^12.4.0",
     "react-native-tab-view": "^3.3.0",
     "react-native-url-polyfill": "^1.3.0",
+    "react-native-version-number": "^0.3.6",
     "react-native-web": "^0.17.7",
     "tlds": "^1.234.0"
   },
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 2b23884735..05a0a9ed9a 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -21,7 +21,7 @@ export function UserAvatar({
   size: number
   handle: string
   displayName: string | undefined
-  userAvatar: string | null | undefined
+  userAvatar?: string | null
   setUserAvatar?: React.Dispatch<React.SetStateAction<string | null>>
 }) {
   const initials = getInitials(displayName || handle)
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 684e984bdd..b0c6bb165c 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -17,7 +17,7 @@ export function UserBanner({
   setUserBanner,
 }: {
   handle: string
-  userBanner: string | null | undefined
+  userBanner?: string | null
   setUserBanner?: React.Dispatch<React.SetStateAction<string | null>>
 }) {
   const gradient = getGradient(handle)
diff --git a/src/view/screens/Menu.tsx b/src/view/screens/Menu.tsx
index d226ea02b0..2b7c873111 100644
--- a/src/view/screens/Menu.tsx
+++ b/src/view/screens/Menu.tsx
@@ -7,7 +7,8 @@ import {
   View,
   ViewStyle,
 } from 'react-native'
-import {colors} from '../lib/styles'
+import VersionNumber from 'react-native-version-number'
+import {s, colors} from '../lib/styles'
 import {ScreenParams} from '../routes'
 import {useStores} from '../../state'
 import {
@@ -171,6 +172,12 @@ export const Menu = ({navIdx, visible}: ScreenParams) => {
             ))
           : undefined}
       </View>
+      <View style={styles.footer}>
+        <Text style={s.gray4}>
+          Build version {VersionNumber.appVersion} ({VersionNumber.buildVersion}
+          )
+        </Text>
+      </View>
     </View>
   )
 }
@@ -243,4 +250,9 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     color: colors.white,
   },
+
+  footer: {
+    paddingHorizontal: 14,
+    paddingVertical: 18,
+  },
 })
diff --git a/yarn.lock b/yarn.lock
index bbaaa2d6a6..8fd48e9f94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10293,6 +10293,11 @@ react-native-url-polyfill@^1.3.0:
   dependencies:
     whatwg-url-without-unicode "8.0.0-3"
 
+react-native-version-number@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/react-native-version-number/-/react-native-version-number-0.3.6.tgz#dd8b1435fc217df0a166d7e4a61fdc993f3e7437"
+  integrity sha512-TdyXiK90NiwmSbmAUlUBOV6WI1QGoqtvZZzI5zQY4fKl67B3ZrZn/h+Wy/OYIKKFMfePSiyfeIs8LtHGOZ/NgA==
+
 react-native-web@^0.17.7:
   version "0.17.7"
   resolved "https://registry.yarnpkg.com/react-native-web/-/react-native-web-0.17.7.tgz#038899dbc94467a0ca0be214b88a30e0c117b176"