From f6c5cf447ec204a2fd8eccd2989a3ea95cc80fa6 Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Mon, 10 May 2021 19:52:26 +0000
Subject: [PATCH] Uplift of #8761 (squashed) to release

---
 .../shared/components/onboarding/rewards_tour_panels.tsx    | 5 +++--
 .../brave_rewards/resources/tip/components/tip_form.tsx     | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/brave_rewards/resources/shared/components/onboarding/rewards_tour_panels.tsx b/components/brave_rewards/resources/shared/components/onboarding/rewards_tour_panels.tsx
index a8fd0c941e61..2d45c7ebab6f 100644
--- a/components/brave_rewards/resources/shared/components/onboarding/rewards_tour_panels.tsx
+++ b/components/brave_rewards/resources/shared/components/onboarding/rewards_tour_panels.tsx
@@ -117,7 +117,8 @@ export function getVerifyWalletPanel (
   locale: Locale,
   props: RewardsTourProps
 ): TourPanel | null {
-  if (!props.firstTimeSetup || props.onlyAnonWallet) {
+  if (!props.firstTimeSetup || props.onlyAnonWallet ||
+      !props.onVerifyWalletClick) {
     return null
   }
 
@@ -144,7 +145,7 @@ export function getVerifyWalletPanel (
             formatMessage(getString('onboardingPanelBitflyerLearnMore'), {
               tags: {
                 $1: (content) => (
-                  <NewTabLink href='https://brave.com/ja/users-bitflyer/'>
+                  <NewTabLink key='learn-more' href='https://brave.com/ja/users-bitflyer/'>
                     {content}
                   </NewTabLink>
                 )
diff --git a/components/brave_rewards/resources/tip/components/tip_form.tsx b/components/brave_rewards/resources/tip/components/tip_form.tsx
index 8140fb3d5197..1387e9a9f85c 100644
--- a/components/brave_rewards/resources/tip/components/tip_form.tsx
+++ b/components/brave_rewards/resources/tip/components/tip_form.tsx
@@ -126,6 +126,11 @@ export function TipForm () {
 
     const onTourDone = () => setShowTour(false)
 
+    const onVerifyClick = () => {
+      window.open('chrome://rewards/#verify', '_blank')
+      setShowTour(false)
+    }
+
     return (
       <style.tour>
         <RewardsTour
@@ -137,6 +142,7 @@ export function TipForm () {
           autoContributeAmountOptions={autoContributeChoices}
           onAdsPerHourChanged={host.setAdsPerHour}
           onAutoContributeAmountChanged={host.setAutoContributeAmount}
+          onVerifyWalletClick={onVerifyClick}
           onDone={onTourDone}
         />
       </style.tour>