Merge pull request #3322 from brave/connected-popup

Adds options for connected state
brave · Sep 2, 2019 · d225260 · d225260
2 parents f9e1c47 + b36edcc
commit d225260
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -497,6 +497,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "walletButtonUnverified", IDS_BRAVE_UI_WALLET_BUTTON_UNVERIFIED },
         { "walletButtonVerified", IDS_BRAVE_UI_WALLET_BUTTON_VERIFIED },
         { "walletGoToUphold", IDS_BRAVE_UI_WALLET_GO_TO_UPHOLD },
+        { "walletGoToVerifyPage", IDS_BRAVE_UI_WALLET_GO_TO_VERIFY_PAGE },
         { "walletDisconnect", IDS_BRAVE_UI_WALLET_DISCONNECT },
         { "walletVerificationButton", IDS_BRAVE_UI_WALLET_VERIFICATION_BUTTON },
         { "walletVerificationFooter", IDS_BRAVE_UI_WALLET_VERIFICATION_FOOTER },

diff --git a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json
@@ -532,5 +532,9 @@
   "connectedText":  {
     "message": "This creator has not yet signed up to receive contributions from Brave users. Any tips you send will remain in your wallet until they verify.",
     "description": "Text shown for connected publishers that are not fully verified in the panel"
+  },
+  "walletGoToVerifyPage":  {
+    "message": "Complete wallet verification",
+    "description": "CTA for completing wallet verification"
   }
 }
diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -595,6 +595,9 @@ export class Panel extends React.Component<Props, State> {
     }
 
     switch (externalWallet.status) {
+      // ledger::WalletStatus::CONNECTED
+      case 1:
+        return 'connected'
       // ledger::WalletStatus::VERIFIED
       case 2:
         return 'verified'

diff --git a/components/brave_rewards/resources/ui/components/pageWallet.tsx b/components/brave_rewards/resources/ui/components/pageWallet.tsx
@@ -368,6 +368,9 @@ class PageWallet extends React.Component<Props, State> {
     }
 
     switch (externalWallet.status) {
+      // ledger::WalletStatus::CONNECTED
+      case 1:
+        return 'connected'
       // WalletStatus::VERIFIED
       case 2:
         return 'verified'

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -574,6 +574,7 @@
       <message name="IDS_BRAVE_UI_WALLET_BUTTON_UNVERIFIED" desc="">Verify Wallet</message>
       <message name="IDS_BRAVE_UI_WALLET_BUTTON_VERIFIED" desc="">Verified</message>
       <message name="IDS_BRAVE_UI_WALLET_GO_TO_UPHOLD" desc="">Go to my Uphold account</message>
+      <message name="IDS_BRAVE_UI_WALLET_GO_TO_VERIFY_PAGE" desc="CTA for completing wallet verification">Complete wallet verification</message>
       <message name="IDS_BRAVE_UI_WALLET_DISCONNECT" desc="">Disconnect from Brave Rewards</message>
       <message name="IDS_BRAVE_UI_WALLET_VERIFICATION_BUTTON" desc="">Verify wallet</message>
       <message name="IDS_BRAVE_UI_WALLET_VERIFICATION_FOOTER" desc="">Our wallet service is provided by</message>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -290,7 +290,7 @@
     "@types/storybook__react": "^4.0.2",
     "awesome-typescript-loader": "^5.2.1",
     "babel-loader": "^8.0.6",
-    "brave-ui": "github:brave/brave-ui#993fca92ded27730754611d2eed308cf261232c7",
+    "brave-ui": "github:brave/brave-ui#548aaa3f15ba4a64506d636db6f77ccea71c713c",
     "css-loader": "^2.1.1",
     "csstype": "^2.5.5",
     "deep-freeze-node": "^1.1.3",