Merge branch 'main' into swaps-4038-trending-e2e

Author: bfullam

.eslintrc.js

@@ -117,19 +117,12 @@ module.exports = {
       },
     },
     {
-      files: ['app/components/UI/Card/**/*.{js,jsx,ts,tsx}'],
-      rules: {
-        '@metamask/design-tokens/color-no-hex': 'error',
-      },
-    },
-    {
-      files: ['app/components/Snaps/**/*.{js,jsx,ts,tsx}'],
-      rules: {
-        '@metamask/design-tokens/color-no-hex': 'error',
-      },
-    },
-    {
-      files: ['app/components/UI/Predict/**/*.{js,jsx,ts,tsx}'],
+      files: [
+        'app/components/UI/Card/**/*.{js,jsx,ts,tsx}',
+        'app/components/Snaps/**/*.{js,jsx,ts,tsx}',
+        'app/components/UI/Predict/**/*.{js,jsx,ts,tsx}',
+        'app/components/UI/Rewards/**/*.{js,jsx,ts,tsx}',
+      ],
       rules: {
         '@metamask/design-tokens/color-no-hex': 'error',
       },

app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts

@@ -23,14 +23,12 @@ export const createStyles = (params: { theme: Theme }) => {
       backgroundColor: theme.colors.background.default,
     },
     quoteContainer: {
-      flex: 1,
       justifyContent: 'flex-start',
     },
     destinationAccountSelectorContainer: {
       paddingBottom: 12,
     },
     dynamicContent: {
-      flex: 1,
       justifyContent: 'flex-start',
     },
     keypadContainerWithDestinationPicker: {
@@ -42,6 +40,10 @@ export const createStyles = (params: { theme: Theme }) => {
     },
     scrollViewContent: {
       flexGrow: 1,
+      paddingBottom: 16,
+    },
+    loadingContainer: {
+      paddingTop: 8,
     },
     disclaimerText: {
       textAlign: 'center',