Apply mobile fixes

Expensify · Aug 10, 2020 · 798135c · 798135c
1 parent a813cde
commit 798135c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -20,7 +20,8 @@ Store.init();
 class Expensify extends Component {
     render() {
         return (
-            <Beforeunload onBeforeunload={ActiveClientManager.removeClient}>
+            // TODO: Mobile does not support Beforeunload
+            // <Beforeunload onBeforeunload={ActiveClientManager.removeClient}>
                 <Router>
                     {/* If there is ever a property for redirecting, we do the redirect here */}
                     {this.state && this.state.redirectTo && <Redirect to={this.state.redirectTo} />}
@@ -30,7 +31,7 @@ class Expensify extends Component {
                         <Route path="/" component={HomePage} />
                     </Switch>
                 </Router>
-            </Beforeunload>
+            // </Beforeunload>
         );
     }
 }

diff --git a/src/page/HomePage/SidebarLink.js b/src/page/HomePage/SidebarLink.js
@@ -50,10 +50,12 @@ class SidebarLink extends React.Component {
         return (
             <View style={linkWrapperActiveStyle}>
                 <Link to={`/${this.props.reportID}`} style={linkActiveStyle}>
-                    <Text style={textActiveStyle}>{this.props.reportName}</Text>
-                    {this.state.isUnread && (
-                        <Text style={textActiveStyle}>- Unread</Text>
-                    )}
+                    <View>
+                        <Text style={textActiveStyle}>{this.props.reportName}</Text>
+                        {this.state.isUnread && (
+                            <Text style={textActiveStyle}>- Unread</Text>
+                        )}
+                    </View>
                 </Link>
             </View>
         );

diff --git a/src/style/StyleSheet.js b/src/style/StyleSheet.js
@@ -42,15 +42,18 @@ const styles = {
         padding: 8,
     },
     sidebarLink: {
-        padding: '.5rem 1rem',
+        // TODO: Mobile does not support rem values
+        // padding: '.5rem 1rem',
         textDecorationLine: 'none',
     },
     sidebarLinkActive: {
         backgroundColor: '#007bff',
-        borderRadius: '.25rem',
+        // TODO: Mobile does not support rem values
+        // borderRadius: '.25rem',
     },
     sidebarLinkActiveAnchor: {
-        padding: '.5rem 1rem',
+        // TODO: Mobile does not support rem values
+        // padding: '.5rem 1rem',
         textDecorationLine: 'none',
     },
     sidebarLinkText: {