Merge pull request #7925 from medelman17/main

fix(aws-amplify-react-native): respect user provided theme in react-native withAuthenticator HOC
aws-amplify · Mar 11, 2021 · 5a6cecd · 5a6cecd
2 parents 85d4dcf + 64357b1
commit 5a6cecd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/aws-amplify-react-native/src/Auth/index.tsx b/packages/aws-amplify-react-native/src/Auth/index.tsx
@@ -58,7 +58,7 @@ interface IWithAuthenticatorState {
 
 export function withAuthenticator<Props extends object>(
 	Comp: React.ComponentType<Props>,
-	includeGreetings = false,
+	includeGreetings: boolean | { [index: string]: any } = false,
 	authenticatorComponents = [],
 	federated = null,
 	theme: AmplifyThemeType = null,
@@ -80,6 +80,9 @@ export function withAuthenticator<Props extends object>(
 			this.authConfig = {};
 
 			if (typeof includeGreetings === 'object' && includeGreetings !== null) {
+				if (includeGreetings.theme) {
+					theme = includeGreetings.theme;
+				}
 				this.authConfig = Object.assign(this.authConfig, includeGreetings);
 			} else {
 				this.authConfig = {