Rewards: Imported from brave-ui: Android fixes (#1136, #1018, #1004, #…

…1147)
brave · Sep 19, 2019 · eabb47f · eabb47f
1 parent da533c6
commit eabb47f
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 0 deletions.
diff --git a/...onents/brave_rewards/resources/ui/components/mobile/boxMobile/__snapshots__/spec.tsx.snap b/...onents/brave_rewards/resources/ui/components/mobile/boxMobile/__snapshots__/spec.tsx.snap
@@ -106,6 +106,7 @@ exports[`Box tests basic tests matches the snapshot 1`] = `
   display: flex;
   margin-top: -8px;
   padding: 0px;
+  z-index: 1;
 }
 
 <div

diff --git a/components/brave_rewards/resources/ui/components/mobile/boxMobile/style.ts b/components/brave_rewards/resources/ui/components/mobile/boxMobile/style.ts
@@ -209,6 +209,7 @@ export const StyledToggleHeader = styled<StyleProps, 'div'>('div')`
   ${p => getFixedStyling(p.detailView)}
   margin-top: ${p => p.detailView ? 0 : -8}px;
   padding: ${p => p.detailView ? '20px 20px 15px 13px' : '0px'};
+  z-index: 1;
 `
 
 export const StyledBackArrow = styled<{}, 'span'>('span')`

diff --git a/components/brave_rewards/resources/ui/components/rewardsButton/__snapshots__/spec.tsx.snap b/components/brave_rewards/resources/ui/components/rewardsButton/__snapshots__/spec.tsx.snap
@@ -11,9 +11,14 @@ exports[`TipButton tests basic tests matches the snapshot 1`] = `
   font-size: 14px;
   border-radius: 28px;
   background: inherit;
+  border: none;
   cursor: pointer;
 }
 
+.c0:focus {
+  outline: 0;
+}
+
 .c1 {
   font-family: Poppins,sans-serif;
   font-weight: 600;

diff --git a/components/brave_rewards/resources/ui/components/rewardsButton/style.ts b/components/brave_rewards/resources/ui/components/rewardsButton/style.ts
@@ -63,8 +63,13 @@ export const StyledButtonWrapper = styled<StyleProps, 'button'>('button')`
   font-size: 14px;
   border-radius: 28px;
   background: inherit;
+  border: none;
   cursor: ${p => p.disabled ? 'default' : 'pointer'};
   ${p => getTypeStyle(p.type, p.disabled)}
+
+  &:focus {
+    outline: 0;
+  }
 `
 
 export const StyledButtonText = styled<{}, 'span'>('span')`

diff --git a/components/brave_rewards/resources/ui/components/walletPanel/__snapshots__/spec.tsx.snap b/components/brave_rewards/resources/ui/components/walletPanel/__snapshots__/spec.tsx.snap
@@ -105,6 +105,7 @@ exports[`WalletPanel tests basic tests matches the snapshot 1`] = `
   font-size: 14px;
   border-radius: 28px;
   background: inherit;
+  border: none;
   cursor: pointer;
   height: 40px;
   color: #4C54D2;
@@ -113,6 +114,10 @@ exports[`WalletPanel tests basic tests matches the snapshot 1`] = `
   border: 1px solid #A1A8F2;
 }
 
+.c10:focus {
+  outline: 0;
+}
+
 .c11 {
   font-family: Poppins,sans-serif;
   font-weight: 600;

diff --git a/components/brave_rewards/resources/ui/components/walletWrapper/__snapshots__/spec.tsx.snap b/components/brave_rewards/resources/ui/components/walletWrapper/__snapshots__/spec.tsx.snap
@@ -16,6 +16,8 @@ exports[`WalletWrapper tests basic tests matches the snapshot 1`] = `
   -webkit-flex-direction: column;
   -ms-flex-direction: column;
   flex-direction: column;
+  max-width: 415px;
+  margin: 0 auto;
 }
 
 .c1 {

diff --git a/components/brave_rewards/resources/ui/components/walletWrapper/style.ts b/components/brave_rewards/resources/ui/components/walletWrapper/style.ts
@@ -42,6 +42,8 @@ export const StyledWrapper = styled<StyledProps, 'div'>('div')`
   border-radius: ${p => p.compact ? '0' : '6px'};
   display: flex;
   flex-direction: column;
+  max-width: 415px;
+  margin: 0 auto;
 `
 
 export const StyledHeader = styled<{}, 'div'>('div')`

diff --git a/components/brave_rewards/resources/ui/components/welcomePage/__snapshots__/spec.tsx.snap b/components/brave_rewards/resources/ui/components/welcomePage/__snapshots__/spec.tsx.snap
@@ -156,6 +156,7 @@ exports[`WelcomePage tests basic tests matches the snapshot 1`] = `
   font-size: 14px;
   border-radius: 28px;
   background: inherit;
+  border: none;
   cursor: pointer;
   height: 56px;
   border-radius: 28px;
@@ -170,6 +171,10 @@ exports[`WelcomePage tests basic tests matches the snapshot 1`] = `
   background: rgba(0,0,0,0.05);
 }
 
+.c17:focus {
+  outline: 0;
+}
+
 .c44 {
   width: 100%;
   display: -webkit-box;
@@ -180,6 +185,7 @@ exports[`WelcomePage tests basic tests matches the snapshot 1`] = `
   font-size: 14px;
   border-radius: 28px;
   background: inherit;
+  border: none;
   cursor: pointer;
   height: 56px;
   -webkit-letter-spacing: .6px;
@@ -189,6 +195,10 @@ exports[`WelcomePage tests basic tests matches the snapshot 1`] = `
   background: #FB542B;
 }
 
+.c44:focus {
+  outline: 0;
+}
+
 .c18 {
   font-family: Poppins,sans-serif;
   font-weight: 600;

diff --git a/components/brave_rewards/resources/ui/stories/settingsMobile/contributeBoxMobile.tsx b/components/brave_rewards/resources/ui/stories/settingsMobile/contributeBoxMobile.tsx
@@ -234,6 +234,7 @@ class ContributeBoxMobile extends React.Component<Props, State> {
               <div data-value='10'><Tokens value={'10.0'} converted={'4.00'}/></div>
               <div data-value='20'><Tokens value={'20.0'} converted={'6.00'}/></div>
               <div data-value='40'><Tokens value={'40.0'} converted={'12.00'}/></div>
+              <div data-value='40'><Tokens value={'60.0'} converted={'12.00'}/></div>
               <div data-value='100'><Tokens value={'100.0'} converted={'40.00'}/></div>
             </Select>
           </StyledListContent>