resolve conflicts, update logic

src/components/Button/index.tsx

@@ -187,7 +187,7 @@ function Button(
 
         small = false,
         large = false,
-        medium = true,
+        medium = !small && !large,
 
         isLoading = false,
         isDisabled = false,

src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx

@@ -267,7 +267,7 @@ function ReportFieldsListValuesPage({
 
         return (
             <Button
-                style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+                style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
                 success
                 icon={Expensicons.Plus}
                 text={translate('workspace.reportFields.addValue')}