Merge pull request #4428 from EdgeApp/jon/auto-logout-ui2

- changed: Update UI theme for Settings AutoLogoutModal
EdgeApp · Sep 4, 2023 · e52d3a6 · e52d3a6
2 parents bc5a7b2 + 07ced1d
commit e52d3a6
Show file tree

Hide file tree

Showing 19 changed files with 516 additions and 1,028 deletions.
diff --git a/src/__tests__/modals/__snapshots__/AutoLogoutModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/AutoLogoutModal.test.tsx.snap
diff --git a/src/__tests__/scenes/__snapshots__/FioAddressListScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/FioAddressListScene.test.tsx.snap
@@ -272,8 +272,7 @@ exports[`FioAddressList should render with loading props 1`] = `
               "paymentTypeVisa": {
                 "testUri": "../../../src/assets/images/paymentTypes/paymentTypeVisa.png",
               },
-              "pickerTextDark": "#FFFFFF",
-              "pickerTextLight": "#000000",
+              "pickerText": "#FFFFFF",
               "pinUsernameButton": [
                 "rgba(255, 255, 255, 0)",
                 "rgba(255, 255, 255, 0)",
@@ -721,8 +720,7 @@ exports[`FioAddressList should render with loading props 1`] = `
               "paymentTypeVisa": {
                 "testUri": "../../../src/assets/images/paymentTypes/paymentTypeVisa.png",
               },
-              "pickerTextDark": "#FFFFFF",
-              "pickerTextLight": "#000000",
+              "pickerText": "#FFFFFF",
               "pinUsernameButton": [
                 "rgba(255, 255, 255, 0)",
                 "rgba(255, 255, 255, 0)",

diff --git a/src/components/legacy/AirshipModal.tsx b/src/components/legacy/AirshipModal.tsx
diff --git a/src/components/legacy/Buttons/PrimaryButton.ui.tsx b/src/components/legacy/Buttons/PrimaryButton.ui.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react'
-import { Text as RNText, TextStyle, TouchableHighlight, TouchableHighlightProps, View } from 'react-native'
+import { StyleSheet, Text as RNText, TextStyle, TouchableHighlight, TouchableHighlightProps, View } from 'react-native'
 
-import { primaryButtonUnderlay, styles } from './style'
+import { THEME } from '../../../theme/variables/airbitz'
+import { scale } from '../../../util/scaling'
 
 interface TextProps {
   children: React.ReactNode
@@ -35,3 +36,29 @@ export class PrimaryButton extends React.Component<Props> {
     )
   }
 }
+
+const primaryButtonUnderlay = { color: THEME.COLORS.PRIMARY }
+
+const styles = StyleSheet.create({
+  button: {
+    padding: 14,
+    borderRadius: 5,
+    alignItems: 'center',
+    justifyContent: 'center',
+    flex: -1
+  },
+  buttonText: {
+    fontFamily: THEME.FONTS.DEFAULT,
+    fontSize: scale(18),
+    lineHeight: scale(18),
+    position: 'relative',
+    top: 1
+  },
+  // PRIMARY BUTTON
+  primaryButton: {
+    backgroundColor: THEME.COLORS.SECONDARY
+  },
+  primaryButtonText: {
+    color: THEME.COLORS.WHITE
+  }
+})
diff --git a/src/components/legacy/Buttons/SecondaryButton.ui.tsx b/src/components/legacy/Buttons/SecondaryButton.ui.tsx
diff --git a/src/components/legacy/Buttons/TertiaryButton.ui.tsx b/src/components/legacy/Buttons/TertiaryButton.ui.tsx
diff --git a/src/components/legacy/Buttons/style.ts b/src/components/legacy/Buttons/style.ts
diff --git a/src/components/legacy/ContentArea.tsx b/src/components/legacy/ContentArea.tsx
diff --git a/src/components/legacy/IconCircle.tsx b/src/components/legacy/IconCircle.tsx