Use first name instead of full name in rewards uphold

Resolves brave/brave-browser#9909
brave · May 26, 2020 · e90090d · e90090d
1 parent 83ac688
commit e90090d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 16 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,
         { "grantFinishTokenUGP", IDS_BRAVE_UI_GRANT_FINISH_TOKEN_UGP },
         { "grantFinishPointUGP", IDS_BRAVE_UI_GRANT_FINISH_POINT_UGP },
         { "grants", IDS_BRAVE_UI_GRANTS },
+        { "greetingsVerified", IDS_BRAVE_UI_GREETINGS_VERIFIED },
         { "import", IDS_BRAVE_UI_IMPORT },
         { "includeInAuto", IDS_BRAVE_UI_INCLUDE_IN_AUTO },
         { "learnMore", IDS_BRAVE_UI_LEARN_MORE },

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
@@ -588,5 +588,15 @@
   "pointGrants":  {
     "message": "Point Grants",
     "description": "BAT Points Grant Text"
+  },
+  "greetingsVerified":  {
+    "message": "Hello, $name$!",
+    "description": "Greetings for external wallet popup",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John"
+      }
+    }
   }
 }
diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts b/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts
@@ -59,6 +59,7 @@ export const getUIMessages = (): Record<string, string> => {
     'grantGeneralErrorText',
     'grantGeneralErrorTitle',
     'grants',
+    'greetingsVerified',
     'includeInAuto',
     'insufficientFunds',
     'insufficientFundsNotification',

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/app.tsx
@@ -335,7 +335,7 @@ export class RewardsPanel extends React.Component<Props, State> {
                 onVerifyClick={onVerifyClick}
                 onDisconnectClick={this.onDisconnectClick}
                 goToUphold={this.goToUphold}
-                userName={utils.getUserName(externalWallet)}
+                greetings={utils.getGreetings(externalWallet)}
                 actions={this.getActions()}
               >
                 <WalletPanelDisabled

diff --git a/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/components/panel.tsx
@@ -741,7 +741,7 @@ export class Panel extends React.Component<Props, State> {
         onVerifyClick={onVerifyClick}
         onDisconnectClick={this.onDisconnectClick}
         goToUphold={this.goToUphold}
-        userName={utils.getUserName(externalWallet)}
+        greetings={utils.getGreetings(externalWallet)}
         onlyAnonWallet={this.props.onlyAnonWallet}
         {...notification}
       >

diff --git a/components/brave_rewards/resources/extension/brave_rewards/utils.ts b/components/brave_rewards/resources/extension/brave_rewards/utils.ts
@@ -139,12 +139,12 @@ export const getWalletStatus = (externalWallet?: RewardsExtension.ExternalWallet
   }
 }
 
-export const getUserName = (externalWallet?: RewardsExtension.ExternalWallet) => {
-  if (!externalWallet) {
+export const getGreetings = (externalWallet?: RewardsExtension.ExternalWallet) => {
+  if (!externalWallet || !externalWallet.userName) {
     return ''
   }
 
-  return externalWallet.userName
+  return getMessage('greetingsVerified', [externalWallet.userName])
 }
 
 export const handleUpholdLink = (link: string, externalWallet?: RewardsExtension.ExternalWallet) => {

diff --git a/components/brave_rewards/resources/page/components/pageWallet.tsx b/components/brave_rewards/resources/page/components/pageWallet.tsx
@@ -442,13 +442,13 @@ class PageWallet extends React.Component<Props, State> {
     window.open(externalWallet.accountUrl, '_self')
   }
 
-  getUserName = () => {
+  getGreetings = () => {
     const { externalWallet } = this.props.rewardsData
-    if (!externalWallet) {
+    if (!externalWallet || !externalWallet.userName) {
       return ''
     }
 
-    return externalWallet.userName
+    return getLocale('greetingsVerified', { name: externalWallet.userName })
   }
 
   onDisconnectClick = () => {
@@ -779,7 +779,7 @@ class PageWallet extends React.Component<Props, State> {
           onVerifyClick={onVerifyClick}
           onDisconnectClick={this.onDisconnectClick}
           goToUphold={this.goToUphold}
-          userName={this.getUserName()}
+          greetings={this.getGreetings()}
           onlyAnonWallet={onlyAnonWallet}
         >
           {

diff --git a/components/brave_rewards/resources/ui/components/walletPopup/index.tsx b/components/brave_rewards/resources/ui/components/walletPopup/index.tsx
@@ -23,7 +23,7 @@ import {
 export interface Props {
   children: React.ReactNode
   onClose: () => void
-  userName: string
+  greetings: string
   id?: string
   verified?: boolean
 }
@@ -38,7 +38,7 @@ export default class WalletPopup extends React.PureComponent<Props, {}> {
     const {
       children,
       onClose,
-      userName,
+      greetings,
       id,
       verified
     } = this.props
@@ -50,7 +50,7 @@ export default class WalletPopup extends React.PureComponent<Props, {}> {
               <StyledIcon>
                 <UpholdColorIcon />
               </StyledIcon>
-              {userName}
+              {greetings}
               {
                 verified
                 ? <StyledStatus>

diff --git a/components/brave_rewards/resources/ui/components/walletWrapper/index.tsx b/components/brave_rewards/resources/ui/components/walletWrapper/index.tsx
@@ -149,7 +149,7 @@ export interface Props {
   onVerifyClick?: () => void
   onDisconnectClick?: () => void
   goToUphold?: () => void
-  userName?: string
+  greetings?: string
   onlyAnonWallet?: boolean
 }
 
@@ -402,14 +402,14 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
   }
 
   getVerificationDetails = () => {
-    const { goToUphold, userName, onDisconnectClick, onVerifyClick, walletState } = this.props
+    const { goToUphold, greetings, onDisconnectClick, onVerifyClick, walletState } = this.props
     const verified = walletState === 'verified'
     const connected = walletState === 'connected'
 
     return (
       <WalletPopup
         onClose={this.toggleVerificationDetails}
-        userName={userName || ''}
+        greetings={greetings || ''}
         verified={verified}
       >
         {

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -484,6 +484,7 @@
       <message name="IDS_BRAVE_UI_GRANT_DISCLAIMER" desc="">{{currency}} not used by the expiration date will be automatically returned to the Brave User Growth Pool.</message>
       <message name="IDS_BRAVE_UI_GRANT_EXPIRE" desc="">Grant Expiration Date</message>
       <message name="IDS_BRAVE_UI_GRANTS" desc="">Grants</message>
+      <message name="IDS_BRAVE_UI_GREETINGS_VERIFIED" desc="">Hello, {{name}}!</message>
       <message name="IDS_BRAVE_UI_IMPORT" desc="">import</message>
       <message name="IDS_BRAVE_UI_INCLUDE_IN_AUTO" desc="">Include in Auto-Contribute</message>
       <message name="IDS_BRAVE_UI_LEARN_MORE" desc="">Learn More</message>

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_user.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_user.cc
@@ -92,7 +92,7 @@ void UpholdUser::OnGet(
     return;
   }
 
-  const auto* name = dictionary->FindStringKey("name");
+  const auto* name = dictionary->FindStringKey("firstName");
   if (name) {
     user.name = *name;
   }