Fixes panel create wallet

Fixes panel favicon Resolves brave/brave-browser#1719 Resolves brave/brave-browser#1792
brave · Oct 24, 2018 · 7e57ba3 · bridiver · Dec 15, 2018 · bridiver
1 parent 1d8d721
commit 7e57ba3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -511,6 +511,13 @@ void RewardsServiceImpl::Shutdown() {
 void RewardsServiceImpl::OnWalletInitialized(ledger::Result result) {
   if (!ready_.is_signaled())
     ready_.Signal();
+
+  if (result == ledger::Result::WALLET_CREATED) {
+    SetRewardsMainEnabled(true);
+    SetAutoContribute(true);
+    result = ledger::Result::LEDGER_OK;
+  }
+
   TriggerOnWalletInitialized(result);
 }
 

diff --git a/components/brave_rewards/extension/brave_rewards/components/app.tsx b/components/brave_rewards/extension/brave_rewards/components/app.tsx
@@ -32,6 +32,23 @@ export class RewardsPanel extends React.Component<Props, State> {
     chrome.windows.getCurrent({}, this.onWindowCallback)
   }
 
+  componentDidUpdate (prevProps: Props, prevState: State) {
+    if (
+      !prevProps.rewardsPanelData.walletCreated &&
+      this.props.rewardsPanelData.walletCreated
+    ) {
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, (tabs) => {
+        if (!tabs || !tabs.length) {
+          return
+        }
+        this.props.actions.onTabRetrieved(tabs[0])
+      })
+    }
+  }
+
   onWindowCallback = (window: chrome.windows.Window) => {
     this.setState({
       windowId: window.id

diff --git a/components/brave_rewards/ui/reducers/wallet_reducer.ts b/components/brave_rewards/ui/reducers/wallet_reducer.ts
@@ -14,10 +14,9 @@ const createWallet = (state: Rewards.State) => {
   state.enabledAds = true
   state.enabledContribute = true
   state.createdTimestamp = new Date().getTime()
+
   chrome.send('brave_rewards.getReconcileStamp', [])
   chrome.send('brave_rewards.getAddresses', [])
-  chrome.send('brave_rewards.saveSetting', ['enabledMain', 'true'])
-  chrome.send('brave_rewards.saveSetting', ['enabledContribute', 'true'])
   chrome.send('brave_rewards.getContributionAmount', [])
 
   return state
@@ -182,6 +181,7 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
         }
         state = { ...state }
         state = createWallet(state)
+        state.firstLoad = false
         break
       }
     case types.ON_CONTRIBUTION_AMOUNT: