diff --git a/.eslintrc.js b/.eslintrc.js index 39a7c7553261..822a7f66b474 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,6 +24,11 @@ const restrictedImportPaths = [ importNames: ['useSafeAreaInsets', 'SafeAreaConsumer', 'SafeAreaInsetsContext'], message: "Please use 'useSafeAreaInsets' from 'src/hooks/useSafeAreaInset' and/or 'SafeAreaConsumer' from 'src/components/SafeAreaConsumer' instead.", }, + { + name: 'react', + importNames: ['CSSProperties'], + message: "Please use 'ViewStyle', 'TextStyle', 'ImageStyle' from 'react-native' instead.", + }, ]; const restrictedImportPatterns = [ diff --git a/android/app/build.gradle b/android/app/build.gradle index 1338459abdf1..b7ed29f176dc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,8 +91,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001041400 - versionName "1.4.14-0" + versionCode 1001041402 + versionName "1.4.14-2" } flavorDimensions "default" diff --git a/docs/TEMPLATE.md b/docs/TEMPLATE.md index 4408e56382a2..bbf4ab96d35f 100644 --- a/docs/TEMPLATE.md +++ b/docs/TEMPLATE.md @@ -21,7 +21,7 @@ What options does a user have then interacting with this feature? What elements of this feature are pay-walled vs. free? --> -# FAQ +{% include faq-begin.md %} +{% include faq-end.md %} # Deep Dive