Skip to content

Commit 7f3a28b

Browse files
authored
Merge pull request #306 from internxt/bugfix/view-port
[_] bugfix/Fix appscreen layout that makes content surpass screen bounds
2 parents 0cb91d5 + 88e1a3f commit 7f3a28b

12 files changed

Lines changed: 26 additions & 545 deletions

File tree

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ android {
8888
applicationId 'com.internxt.cloud'
8989
minSdkVersion rootProject.ext.minSdkVersion
9090
targetSdkVersion rootProject.ext.targetSdkVersion
91-
versionCode 110
91+
versionCode 111
9292
versionName "1.8.2"
9393

9494
buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())

src/App.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import DeleteAccountModal from './components/modals/DeleteAccountModal';
2121
import EditNameModal from './components/modals/EditNameModal';
2222
import LanguageModal from './components/modals/LanguageModal';
2323
import LinkCopiedModal from './components/modals/LinkCopiedModal';
24-
import PlansModal from './components/modals/PlansModal';
24+
2525
import { DriveContextProvider } from './contexts/Drive';
2626
import { getRemoteUpdateIfAvailable, useLoadFonts } from './helpers';
2727
import useGetColor from './hooks/useColor';
@@ -292,7 +292,6 @@ export default function App(): JSX.Element {
292292
onClose={onChangeProfilePictureModalClosed}
293293
/>
294294
<LanguageModal isOpen={isLanguageModalOpen} onClose={onLanguageModalClosed} />
295-
<PlansModal isOpen={isPlansModalOpen} onClose={onPlansModalClosed} />
296295
</Portal.Host>
297296
</DriveContextProvider>
298297
) : (

src/components/AppScreen/index.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ const AppScreen = (props: AppScreenProps): JSX.Element => {
4040

4141
return (
4242
<View
43-
style={{
44-
paddingBottom: props.hasBottomTabs ? 0 : 0,
45-
backgroundColor,
46-
...propsStyle,
47-
}}
43+
style={[
44+
tailwind('flex-1'),
45+
{
46+
paddingBottom: props.hasBottomTabs ? 0 : 0,
47+
backgroundColor,
48+
},
49+
propsStyle,
50+
]}
4851
>
4952
<View
5053
style={{
@@ -62,7 +65,7 @@ const AppScreen = (props: AppScreenProps): JSX.Element => {
6265

6366
{/* DISMISS KEYBOARD ON OUTSIDE TAP */}
6467
<TouchableWithoutFeedback onPress={onBackgroundPressed}>
65-
<View style={tailwind('absolute h-full w-full')}></View>
68+
<View style={tailwind('absolute h-full w-full')} />
6669
</TouchableWithoutFeedback>
6770

6871
{props.children}

src/components/modals/PlansModal/ConfirmationStep.tsx

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)