Open uphold links in the same tab

Resolves brave/brave-browser#5482
brave · Aug 1, 2019 · bb2a756 · bb2a756
1 parent 779c86b
commit bb2a756
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/components/brave_rewards/browser/rewards_service_browsertest.cc b/components/brave_rewards/browser/rewards_service_browsertest.cc
@@ -2327,10 +2327,6 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
         content::ISOLATED_WORLD_ID_CONTENT_END));
   }
 
-  content::WindowedNotificationObserver auth_obs(
-        content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-        content::NotificationService::AllSources());
-
   // Click on verify button in on boarding
   {
     ASSERT_TRUE(ExecJs(contents(),
@@ -2339,8 +2335,6 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
         content::ISOLATED_WORLD_ID_CONTENT_END));
   }
 
-  auth_obs.Wait();
-
   // Check if we are redirected to uphold
   {
     const GURL current_url = contents()->GetURL();
@@ -2353,13 +2347,7 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
   // Fake successful authentication
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         browser(),
-        uphold_auth_url(), 2);
-
-  content::WindowedNotificationObserver kyc_obs(
-        content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-        content::NotificationService::AllSources());
-
-  kyc_obs.Wait();
+        uphold_auth_url(), 1);
 
   // Check if we are redirected to KYC page
   {

diff --git a/components/brave_rewards/resources/ui/components/pageWallet.tsx b/components/brave_rewards/resources/ui/components/pageWallet.tsx
@@ -338,7 +338,7 @@ class PageWallet extends React.Component<Props, State> {
 
     this.actions.onOnBoardingDisplayed()
 
-    window.open(link, '_blank')
+    window.open(link, '_self')
   }
 
   onVerifyClick = () => {
@@ -390,14 +390,14 @@ class PageWallet extends React.Component<Props, State> {
     switch (action) {
       case 'add': {
         if (externalWallet.addUrl) {
-          window.open(externalWallet.addUrl, '_blank')
+          window.open(externalWallet.addUrl, '_self')
           return
         }
         break
       }
       case 'withdraw': {
         if (externalWallet.withdrawUrl) {
-          window.open(externalWallet.withdrawUrl, '_blank')
+          window.open(externalWallet.withdrawUrl, '_self')
           return
         }
         break
@@ -418,7 +418,7 @@ class PageWallet extends React.Component<Props, State> {
       return
     }
 
-    window.open(externalWallet.accountUrl, '_blank')
+    window.open(externalWallet.accountUrl, '_self')
   }
 
   getUserName = () => {

diff --git a/components/brave_rewards/resources/ui/reducers/rewards_reducer.ts b/components/brave_rewards/resources/ui/reducers/rewards_reducer.ts
@@ -254,7 +254,7 @@ const rewardsReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State
         if (data.action === 'authorization') {
           const url = data.args['redirect_url']
           if (url && url.length > 0) {
-            window.open(url)
+            window.open(url, '_self')
           }
           ui.modalRedirect = 'hide'
           break