From 2fe188561ec16a7009dc7244befbfe215260775b Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Mon, 21 Aug 2023 21:26:05 -0400
Subject: [PATCH] Add changes for zebpay in rewards

---
 android/brave_java_resources.gni                      |  1 +
 .../browser/BraveRewardsUserWalletActivity.java       |  8 ++++++--
 .../chromium/chrome/browser/BraveWalletProvider.java  |  7 ++++---
 .../chrome/browser/rewards/BraveRewardsPanel.java     | 11 ++++++++---
 .../rewards/tipping/RewardsTippingPanelFragment.java  | 11 +++++++++--
 android/java/res/drawable/ic_logo_zebpay.xml          |  9 +++++++++
 browser/ui/android/strings/android_brave_strings.grd  |  3 +++
 7 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 android/java/res/drawable/ic_logo_zebpay.xml

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index 7bee1c03bcb..273b36f3db7 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -543,6 +543,7 @@ brave_java_resources = [
   "java/res/drawable/ic_languages.xml",
   "java/res/drawable/ic_logo_bitflyer.xml",
   "java/res/drawable/ic_logo_bitflyer_colored.xml",
+  "java/res/drawable/ic_logo_zebpay.xml",
   "java/res/drawable/ic_mask.xml",
   "java/res/drawable/ic_menu.xml",
   "java/res/drawable/ic_new_tab_page.xml",
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java
index f685682a70e..6f1ddb6da9b 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java
@@ -82,8 +82,10 @@ public class BraveRewardsUserWalletActivity
             return R.drawable.uphold_green;
         } else if (walletType.equals(BraveWalletProvider.GEMINI)) {
             return R.drawable.ic_gemini_logo_cyan;
-        } else {
+        } else if (walletType.equals(BraveWalletProvider.BITFLYER)) {
             return R.drawable.ic_logo_bitflyer_colored;
+        } else {
+            return R.drawable.ic_logo_zebpay;
         }
     }
 
@@ -92,8 +94,10 @@ public class BraveRewardsUserWalletActivity
             return getResources().getString(R.string.uphold);
         } else if (walletType.equals(BraveWalletProvider.GEMINI)) {
             return getResources().getString(R.string.gemini);
-        } else {
+        } else if (walletType.equals(BraveWalletProvider.BITFLYER)) {
             return getResources().getString(R.string.bitflyer);
+        } else {
+            return getResources().getString(R.string.zebpay);
         }
     }
 
diff --git a/android/java/org/chromium/chrome/browser/BraveWalletProvider.java b/android/java/org/chromium/chrome/browser/BraveWalletProvider.java
index 607092758e0..41ac2ced9c2 100644
--- a/android/java/org/chromium/chrome/browser/BraveWalletProvider.java
+++ b/android/java/org/chromium/chrome/browser/BraveWalletProvider.java
@@ -14,14 +14,15 @@ public class BraveWalletProvider {
 
     public static final String UPHOLD_REDIRECT_URL = "rewards://uphold";
     public static final String GEMINI_REDIRECT_URL = "rewards://gemini";
-    public static final String BRAVE_SUPPORT_URL = "https://community.brave.com";
-    public static final String UPHOLD_ORIGIN_URL = "http://uphold.com";
-
     public static final String BITFLYER_REDIRECT_URL = "rewards://bitflyer";
     public static final String ZEBPAY_REDIRECT_URL = "rewards://zebpay";
 
+    public static final String BRAVE_SUPPORT_URL = "https://community.brave.com";
+    public static final String UPHOLD_ORIGIN_URL = "http://uphold.com";
+
     // Wallet types
     public static final String UPHOLD = "uphold";
     public static final String BITFLYER = "bitflyer";
     public static final String GEMINI = "gemini";
+    public static final String ZEBPAY = "zebpay";
 }
diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
index 6d612003011..f624f91a2cb 100644
--- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
@@ -1687,8 +1687,10 @@ public class BraveRewardsPanel
             return mActivity.getResources().getString(R.string.uphold);
         } else if (walletType.equals(BraveWalletProvider.GEMINI)) {
             return mActivity.getResources().getString(R.string.gemini);
-        } else {
+        } else if (walletType.equals(BraveWalletProvider.BITFLYER){
             return mActivity.getResources().getString(R.string.bitflyer);
+        } else {
+            return mActivity.getResources().getString(R.string.zebpay);
         }
     }
 
@@ -1702,7 +1704,8 @@ public class BraveRewardsPanel
             if (walletStatus == WalletStatus.CONNECTED
                     && (walletType.equals(BraveWalletProvider.UPHOLD)
                             || walletType.equals(BraveWalletProvider.BITFLYER)
-                            || walletType.equals(BraveWalletProvider.GEMINI))) {
+                            || walletType.equals(BraveWalletProvider.GEMINI)
+                            || walletType.equals(BraveWalletProvider.ZEBPAY))) {
                 mPopupView.findViewById(R.id.auto_contribute_summary_seperator)
                         .setVisibility(View.GONE);
                 mPopupView.findViewById(R.id.rewards_from_ads_summary_layout)
@@ -2096,8 +2099,10 @@ public class BraveRewardsPanel
             return R.drawable.uphold_white;
         } else if (walletType.equals(BraveWalletProvider.GEMINI)) {
             return R.drawable.ic_gemini_logo_white;
-        } else {
+        } else if (walletType.equals(BraveWalletProvider.BITFLYER)) {
             return R.drawable.ic_logo_bitflyer;
+        } else {
+            return R.drawable.ic_logo_zebpay;
         }
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java
index 50e774b058a..e44c2966609 100644
--- a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java
+++ b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java
@@ -298,8 +298,10 @@ public class RewardsTippingPanelFragment
             return getResources().getString(R.string.uphold);
         } else if (pubStatus == PublisherStatus.GEMINI_VERIFIED) {
             return getResources().getString(R.string.gemini);
-        } else {
+        } else if (pubStatus == PublisherStatus.BITFLYER_VERIFIED) {
             return getResources().getString(R.string.bitflyer);
+        } else {
+            return getResources().getString(R.string.zebpay);
         }
     }
 
@@ -410,8 +412,10 @@ public class RewardsTippingPanelFragment
             return getResources().getString(R.string.uphold);
         } else if (walletType.equals(BraveWalletProvider.GEMINI)) {
             return getResources().getString(R.string.gemini);
-        } else {
+        } else if (walletType.equals(BraveWalletProvider.BITFLYER)) {
             return getResources().getString(R.string.bitflyer);
+        } else {
+            return getResources().getString(R.string.zebpay);
         }
     }
 
@@ -565,6 +569,9 @@ public class RewardsTippingPanelFragment
         } else if (mWalletType.equals(BraveWalletProvider.GEMINI)) {
             custodianIcon = R.drawable.ic_gemini_logo_cyan;
             custodianName = R.string.gemini;
+        } else if (mWalletType.equals(BraveWalletProvider.ZEBPAY)) {
+            custodianIcon = R.drawable.ic_logo_zebpay;
+            custodianName = R.string.zebpay;
         }
 
         mCustodianText.setText(custodianName);
diff --git a/android/java/res/drawable/ic_logo_zebpay.xml b/android/java/res/drawable/ic_logo_zebpay.xml
new file mode 100644
index 00000000000..b6b27c35758
--- /dev/null
+++ b/android/java/res/drawable/ic_logo_zebpay.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="1697.4"
+    android:viewportHeight="1251.1">
+    <path
+        android:fillColor="#0273F2"
+        android:pathData="M60.6,811.2S2,869.5 0.1,950.7c-1.3,36.7 9.4,78.3 42.6,121.2a30.7,30.7 0,0 0,1.9 2.4,161.1 161.1,0 0,0 44,32.7 40.5,40.5 0,0 0,7.8 3.5c2.7,1.1 5.7,2.4 8.9,3.5a194.3,194.3 0,0 0,26.4 7.6c23.2,4.9 51.5,7.3 86.1,4.6 5.1,-0.5 10.3,-1.1 15.6,-1.6 5.4,-0.8 10.8,-1.3 16.5,-2.4 5.7,-0.8 11.3,-1.9 17.3,-3a2.4,2.4 0,0 0,1.4 -0.3,3.4 3.4,0 0,0 1.6,-0.3c54.3,-10.7 120.6,-33.1 200.6,-72.3L138.3,729.4c-26.4,26.9 -52.5,54.2 -77.7,81.7ZM227.9,641.4l362.5,345.3a382.5,382.5 0,0 1,122.9 -22.6L302.1,572.2a4728.5,4728.5 0,0 0,-74.1 69.1ZM405.6,501.4s818.1,777.7 789.7,748.9l64,-77.2 -776.4,-737.8a5624.8,5624.8 0,0 0,-77.3 66.1ZM645.8,282.6s-21.6,16.7 -56.7,45.1c0,0 -5.9,4.6 -16.7,13.5 -1.3,1.1 -2.7,2.1 -4,3.2l771.4,734.2 65,-77.3L647.9,280.2c-0.8,0.8 -1.3,1.6 -2.1,2.3ZM618.9,12.7s-29.2,9.8 -43,32.6L1482.3,909.3l65.2,-77.1L675,0c-19.5,2.9 -38.5,6.8 -56.1,12.7ZM1040.4,44s-76.5,-25 -172.1,-39.3l765,725.4 64.1,-75.7 -51.1,-48.3 -578.5,-551.1c-9.1,-3.7 -18.1,-7.4 -27.4,-11Z" />
+</vector>
diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
index 8df907ace0a..f03296ed85d 100644
--- a/browser/ui/android/strings/android_brave_strings.grd
+++ b/browser/ui/android/strings/android_brave_strings.grd
@@ -1452,6 +1452,9 @@ Are you sure you want to do this?
       <message name="IDS_GEMINI">
         Gemini
       </message>
+      <message name="IDS_ZEBPAY">
+        Zebpay
+      </message>
       <message name="IDS_VERIFY_WALLET_PROVIDER_NOTE1">
         Uphold may require you to verify your identity based on services requested.
       </message>