Skip to content

Commit af82d10

Browse files
JulesssssJulesssss
authored
Merge pull request #64729 from software-mansion-labs/war-in/revert-sign-in-page
Revert "[HybridApp] Implement POC of NewDot SignIn on HybridApp"
2 parents 532e70a + 4281f3c commit af82d10

47 files changed

Lines changed: 295 additions & 679 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎__mocks__/@ua/react-native-airship.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ enum EventType {
66
PushReceived = 'com.airship.push_received',
77
}
88

9-
// eslint-disable-next-line no-restricted-syntax
10-
enum PermissionStatus {
11-
Granted = 'granted',
12-
Denied = 'denied',
13-
NotDetermined = 'not_determined',
14-
}
15-
169
// eslint-disable-next-line @typescript-eslint/no-namespace
1710
namespace iOS {
1811
/**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
7871

7972
export default Airship;
8073

81-
export {EventType, iOS, PermissionStatus};
74+
export {EventType, iOS};

‎modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,4 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
3636
override fun sendAuthToken(authToken: String?) {
3737
Log.d(NAME, "`sendAuthToken` should never be called in standalone `New Expensify` app")
3838
}
39-
40-
override fun signInToOldDot(
41-
autoGeneratedLogin: String,
42-
autoGeneratedPassword: String,
43-
authToken: String,
44-
email: String,
45-
policyID: String
46-
) {
47-
Log.d(NAME, "`signInToOldDot` should never be called in standalone `New Expensify` app")
48-
}
49-
50-
override fun signOutFromOldDot() {
51-
Log.d(NAME, "`signOutFromOldDot` should never be called in standalone `New Expensify` app")
52-
}
53-
54-
override fun clearOldDotAfterSignOut() {
55-
Log.d(NAME, "`clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app")
56-
}
5739
}

‎modules/hybrid-app/ios/ReactNativeHybridApp.mm‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@ - (void)sendAuthToken:(NSString *)authToken {
2727
NSLog(@"[ReactNativeHybridApp] `sendAuthToken` should never be called in standalone `New Expensify` app");
2828
}
2929

30-
- (void)signInToOldDot:(NSString *)autoGeneratedLogin autoGeneratedPassword:(NSString *)autoGeneratedPassword authToken:(NSString *)authToken email:(NSString *)email policyID:(NSString *)policyID {
31-
NSLog(@"[ReactNativeHybridApp] `signInToOldDot` should never be called in standalone `New Expensify` app");
32-
}
33-
34-
- (void)signOutFromOldDot {
35-
NSLog(@"[ReactNativeHybridApp] `signOutFromOldDot` should never be called in standalone `New Expensify` app");
36-
}
37-
38-
- (void)clearOldDotAfterSignOut {
39-
NSLog(@"[ReactNativeHybridApp] `clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app");
40-
}
41-
4230
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
4331
(const facebook::react::ObjCTurboModule::InitParams &)params
4432
{

‎modules/hybrid-app/src/NativeReactNativeHybridApp.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ export interface Spec extends TurboModule {
99
completeOnboarding: (status: boolean) => void;
1010
switchAccount: (newDotCurrentAccountEmail: string, authToken: string, policyID: string, accountID: string) => void;
1111
sendAuthToken: (authToken: string) => void;
12-
signInToOldDot: (autoGeneratedLogin: string, autoGeneratedPassword: string, authToken: string, email: string, policyID: string) => void;
13-
signOutFromOldDot: () => void;
14-
clearOldDotAfterSignOut: () => void;
1512
}
1613

1714
export default TurboModuleRegistry.getEnforcing<Spec>('ReactNativeHybridApp');

‎modules/hybrid-app/src/index.native.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ const HybridAppModule: HybridAppModuleType = {
2020
sendAuthToken({authToken}) {
2121
ReactNativeHybridApp.sendAuthToken(authToken);
2222
},
23-
signInToOldDot({autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID}) {
24-
ReactNativeHybridApp.signInToOldDot(autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID);
25-
},
26-
signOutFromOldDot() {
27-
ReactNativeHybridApp.signOutFromOldDot();
28-
},
29-
clearOldDotAfterSignOut() {
30-
ReactNativeHybridApp.clearOldDotAfterSignOut();
31-
},
3223
};
3324

3425
export default HybridAppModule;

‎modules/hybrid-app/src/index.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ const HybridAppModule: HybridAppModuleType = {
2424
// eslint-disable-next-line no-console
2525
console.warn('HybridAppModule: `sendAuthToken` should never be called on web');
2626
},
27-
signInToOldDot() {
28-
// eslint-disable-next-line no-console
29-
console.warn('HybridAppModule: `signInToOldDot` should never be called on web');
30-
},
31-
signOutFromOldDot() {
32-
// eslint-disable-next-line no-console
33-
console.warn('HybridAppModule: `signOutFromOldDot` should never be called on web');
34-
},
35-
clearOldDotAfterSignOut() {
36-
// eslint-disable-next-line no-console
37-
console.warn('HybridAppModule: `clearOldDotAfterSignOut` should never be called on web');
38-
},
3927
};
4028

4129
export default HybridAppModule;

‎modules/hybrid-app/src/types.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ type HybridAppModuleType = {
55
completeOnboarding: (args: {status: boolean}) => void;
66
switchAccount: (args: {newDotCurrentAccountEmail: string; authToken: string; policyID: string; accountID: string}) => void;
77
sendAuthToken: (args: {authToken: string}) => void;
8-
signInToOldDot: (args: {autoGeneratedLogin: string; autoGeneratedPassword: string; authToken: string; email: string; policyID: string}) => void;
9-
signOutFromOldDot: () => void;
10-
clearOldDotAfterSignOut: () => void;
118
};
129

1310
export default HybridAppModuleType;

‎src/App.tsx‎

Lines changed: 40 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import {CurrentReportIDContextProvider} from './hooks/useCurrentReportID';
4141
import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
4242
import HybridAppHandler from './HybridAppHandler';
4343
import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
44-
import './libs/HybridApp';
4544
import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
4645
import type {Route} from './ROUTES';
4746
import './setup/backgroundTask';
@@ -82,54 +81,47 @@ function App({url, hybridAppSettings}: AppProps) {
8281
<InitialURLContextProvider url={url}>
8382
<HybridAppHandler hybridAppSettings={hybridAppSettings} />
8483
<GestureHandlerRootView style={fill}>
85-
<SafeAreaProvider
86-
initialMetrics={{
87-
insets: {top: 0, right: 0, bottom: 0, left: 0},
88-
frame: {x: 0, y: 0, width: 0, height: 0},
89-
}}
84+
<ComposeProviders
85+
components={[
86+
OnyxProvider,
87+
ThemeProvider,
88+
ThemeStylesProvider,
89+
ThemeIllustrationsProvider,
90+
SafeAreaProvider,
91+
PortalProvider,
92+
SafeArea,
93+
LocaleContextProvider,
94+
HTMLEngineProvider,
95+
PopoverContextProvider,
96+
CurrentReportIDContextProvider,
97+
ScrollOffsetContextProvider,
98+
ReportAttachmentsProvider,
99+
PickerStateProvider,
100+
EnvironmentProvider,
101+
CustomStatusBarAndBackgroundContextProvider,
102+
ActiveElementRoleProvider,
103+
ActionSheetAwareScrollViewProvider,
104+
PlaybackContextProvider,
105+
FullScreenContextProvider,
106+
VolumeContextProvider,
107+
VideoPopoverMenuContextProvider,
108+
KeyboardProvider,
109+
KeyboardStateProvider,
110+
SearchRouterContextProvider,
111+
ProductTrainingContextProvider,
112+
InputBlurContextProvider,
113+
FullScreenBlockingViewContextProvider,
114+
FullScreenLoaderContextProvider,
115+
]}
90116
>
91-
<ComposeProviders
92-
components={[
93-
OnyxProvider,
94-
ThemeProvider,
95-
ThemeStylesProvider,
96-
ThemeIllustrationsProvider,
97-
PortalProvider,
98-
SafeArea,
99-
LocaleContextProvider,
100-
HTMLEngineProvider,
101-
PopoverContextProvider,
102-
CurrentReportIDContextProvider,
103-
ScrollOffsetContextProvider,
104-
ReportAttachmentsProvider,
105-
PickerStateProvider,
106-
EnvironmentProvider,
107-
CustomStatusBarAndBackgroundContextProvider,
108-
ActiveElementRoleProvider,
109-
ActionSheetAwareScrollViewProvider,
110-
PlaybackContextProvider,
111-
FullScreenContextProvider,
112-
VolumeContextProvider,
113-
VideoPopoverMenuContextProvider,
114-
KeyboardProvider,
115-
KeyboardStateProvider,
116-
SearchRouterContextProvider,
117-
ProductTrainingContextProvider,
118-
InputBlurContextProvider,
119-
FullScreenBlockingViewContextProvider,
120-
FullScreenLoaderContextProvider,
121-
]}
122-
>
123-
<CustomStatusBarAndBackground />
124-
<ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
125-
<HybridAppHandler hybridAppSettings={hybridAppSettings} />
126-
<ColorSchemeWrapper>
127-
<Expensify />
128-
</ColorSchemeWrapper>
129-
</ErrorBoundary>
130-
<NavigationBar />
131-
</ComposeProviders>
132-
</SafeAreaProvider>
117+
<CustomStatusBarAndBackground />
118+
<ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
119+
<ColorSchemeWrapper>
120+
<Expensify />
121+
</ColorSchemeWrapper>
122+
</ErrorBoundary>
123+
<NavigationBar />
124+
</ComposeProviders>
133125
</GestureHandlerRootView>
134126
</InitialURLContextProvider>
135127
</SplashScreenStateContextProvider>

‎src/CONFIG.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@ export default {
9595
GOOGLE_SIGN_IN: {
9696
// cspell:disable-next-line
9797
WEB_CLIENT_ID: '921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com',
98-
// cspell:disable-next-line
9998
IOS_CLIENT_ID: '921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com',
100-
// cspell:disable-next-line
101-
HYBRID_APP_WEB_CLIENT_ID: '1008697809946-5e095eqem3o6ugtpc2rjf7v880tcp28p.apps.googleusercontent.com',
102-
// cspell:disable-next-line
103-
HYBRID_APP_IOS_CLIENT_ID: '1008697809946-sh04nqq0hea396s1qdqqbj6ia649odb2.apps.googleusercontent.com',
10499
},
105100
GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
106101
FIREBASE_WEB_CONFIG: {

‎src/CONST/index.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6969,12 +6969,6 @@ const CONST = {
69696969
HIDDEN: `hidden`,
69706970
},
69716971

6972-
HYBRID_APP_SIGN_IN_STATE: {
6973-
NOT_STARTED: 'notStarted',
6974-
STARTED: 'started',
6975-
FINISHED: 'finished',
6976-
},
6977-
69786972
CSV_IMPORT_COLUMNS: {
69796973
EMAIL: 'email',
69806974
NAME: 'name',

0 commit comments

Comments
 (0)