From 69b3aeb995c8789dd85144f3e78595c9374c0a46 Mon Sep 17 00:00:00 2001
From: Jon Tzeng <jon@edge.app>
Date: Fri, 29 Mar 2024 15:50:25 -0700
Subject: [PATCH] Fix handler for ChangePasswordScreen

---
 CHANGELOG.md                                    |  1 +
 src/components/scenes/UpgradeUsernameScreen.tsx | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 431c114eb9b..6ac76cdb58f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - fixed: Properly show the Thorchain Savers unstake amount including earned amt
 - fixed: Disable RBF for Thorchain Savers transactions
 - fixed: Xcode 15 builds. Remove Flipper as it is deprecated anyway
+- fixed: Light account reporting
 
 ## 4.3.0 (2024-03-25)
 
diff --git a/src/components/scenes/UpgradeUsernameScreen.tsx b/src/components/scenes/UpgradeUsernameScreen.tsx
index 8e269d2f1fe..bd1f77a7100 100644
--- a/src/components/scenes/UpgradeUsernameScreen.tsx
+++ b/src/components/scenes/UpgradeUsernameScreen.tsx
@@ -1,7 +1,8 @@
 import { UpgradeUsernameScreen } from 'edge-login-ui-rn'
 import * as React from 'react'
 
-import { useSelector } from '../../types/reactRedux'
+import { useHandler } from '../../hooks/useHandler'
+import { useDispatch, useSelector } from '../../types/reactRedux'
 import { EdgeSceneProps } from '../../types/routerTypes'
 import { logActivity } from '../../util/logger'
 import { logEvent } from '../../util/tracking'
@@ -13,14 +14,20 @@ export const UpgradeUsernameScene = (props: Props) => {
   const { navigation } = props
   const account = useSelector(state => state.core.account)
   const context = useSelector(state => state.core.context)
+  const dispatch = useDispatch()
 
-  const handleComplete = () => {
+  const handleComplete = useHandler(() => {
     if (account.username != null) logActivity(`Light account backed up as: ${account.username}`)
     navigation.goBack()
-  }
+  })
+
+  const handleLogEvent = useHandler((event, values) => {
+    dispatch(logEvent(event, values))
+  })
+
   return (
     <SceneWrapper hasHeader={false}>
-      <UpgradeUsernameScreen account={account} context={context} onComplete={handleComplete} onLogEvent={logEvent} />
+      <UpgradeUsernameScreen account={account} context={context} onComplete={handleComplete} onLogEvent={handleLogEvent} />
     </SceneWrapper>
   )
 }