Merge pull request #7615 from brave/ksmith-rewards-report-drop-down

Fix rewards monthly report drop-down not updating
brave · Jan 19, 2021 · 09d9bed · 09d9bed
2 parents 4247b2f + 151ba1c
commit 09d9bed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/components/brave_rewards/resources/page/components/pageWallet.tsx b/components/brave_rewards/resources/page/components/pageWallet.tsx
@@ -673,11 +673,10 @@ class PageWallet extends React.Component<Props, State> {
   getMonthlyReportDropDown = (): Record<string, string> => {
     const { monthlyReportIds } = this.props.rewardsData
 
-    let ids = monthlyReportIds
-    if (!monthlyReportIds) {
-      ids = []
-      ids.push(`${new Date().getFullYear()}_${new Date().getMonth() + 1}`)
-    }
+    const ids = [
+      ...monthlyReportIds || [],
+      `${new Date().getFullYear()}_${new Date().getMonth() + 1}`
+    ]
 
     let result: Record<string, string> = {}
     ids.forEach((id: string) => {

diff --git a/components/brave_rewards/resources/ui/components/modalActivity/index.tsx b/components/brave_rewards/resources/ui/components/modalActivity/index.tsx
@@ -151,6 +151,7 @@ export default class ModalActivity extends React.PureComponent<Props, State> {
       return
     }
 
+    this.setState({ currentMonth: value })
     this.props.onMonthChange(value, child)
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           return
         }
+        this.setState({ currentMonth: value })
         this.props.onMonthChange(value, child)
       }
@@ Expand Down @@