Merge pull request #4956 from brave/pr4953_android_promo_expiry_1.7.x

Rewards page: promotion expiry date is not correct.Issue #8692 (uplift to 1.7.x)
brave · Mar 16, 2020 · e1dfa4c · e1dfa4c
2 parents 61100f9 + a67d8a2
commit e1dfa4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
@@ -1159,8 +1159,7 @@ public void OnFetchPromotions() {
               String toInsert = "<b><font color=#ffffff>" + grant[0] + " BAT</font></b> ";
 
               if (grant[2].equals(BraveRewardsPanelPopup.ADS_GRANT_TYPE) == false) {
-                  TimeZone utc = TimeZone.getTimeZone("UTC");
-                  Calendar calTime = Calendar.getInstance(utc);
+                  Calendar calTime = Calendar.getInstance();
                   calTime.setTimeInMillis(Long.parseLong(grant[1]) * 1000);
                   String date = Integer.toString(calTime.get(Calendar.MONTH) + 1) + "/" +
                           Integer.toString(calTime.get(Calendar.DAY_OF_MONTH)) + "/" +

diff --git a/components/brave_rewards/resources/android_page/components/pageWallet.tsx b/components/brave_rewards/resources/android_page/components/pageWallet.tsx
@@ -62,7 +62,7 @@ class PageWallet extends React.Component<Props, State> {
     return claimedPromotions.map((promotion: Rewards.Promotion) => {
       return {
         amount: promotion.amount,
-        expiresAt: new Date(promotion.expiresAt * 1000).toLocaleDateString(),
+        expiresAt: new Date(promotion.expiresAt).toLocaleDateString(),
         type: promotion.type || 0
       }
     })