fix: conflicts

Expensify · Nov 7, 2023 · 8a982c8 · 8a982c8
2 parents a75deb7 + ffc2f2c
commit 8a982c8
Show file tree

Hide file tree

Showing 236 changed files with 2,797 additions and 7,974 deletions.
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -24,8 +24,7 @@ const custom = require('../config/webpack/webpack.common')({
 module.exports = ({config}) => {
     config.resolve.alias = {
         'react-native-config': 'react-web-config',
-        'react-native$': '@expensify/react-native-web',
-        'react-native-web': '@expensify/react-native-web',
+        'react-native$': 'react-native-web',
         '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
         '@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001039600
-        versionName "1.3.96-0"
+        versionCode 1001039603
+        versionName "1.3.96-3"
     }
 
     flavorDimensions "default"

diff --git a/assets/images/bell.svg b/assets/images/bell.svg
diff --git a/assets/images/home-background--android.svg b/assets/images/home-background--android.svg
diff --git a/babel.config.js b/babel.config.js
@@ -17,16 +17,8 @@ const defaultPlugins = [
 ];
 
 const webpack = {
-    env: {
-        production: {
-            presets: defaultPresets,
-            plugins: [...defaultPlugins, 'transform-remove-console'],
-        },
-        development: {
-            presets: defaultPresets,
-            plugins: defaultPlugins,
-        },
-    },
+    presets: defaultPresets,
+    plugins: defaultPlugins,
 };
 
 const metro = {
@@ -78,6 +70,11 @@ const metro = {
             },
         ],
     ],
+    env: {
+        production: {
+            plugins: [['transform-remove-console', {exclude: ['error', 'warn']}]],
+        },
+    },
 };
 
 /*
@@ -102,11 +99,19 @@ if (process.env.CAPTURE_METRICS === 'true') {
     ]);
 }
 
-module.exports = ({caller}) => {
+module.exports = (api) => {
+    console.debug('babel.config.js');
+    console.debug('  - api.version:', api.version);
+    console.debug('  - api.env:', api.env());
+    console.debug('  - process.env.NODE_ENV:', process.env.NODE_ENV);
+    console.debug('  - process.env.BABEL_ENV:', process.env.BABEL_ENV);
+
     // For `react-native` (iOS/Android) caller will be "metro"
     // For `webpack` (Web) caller will be "@babel-loader"
     // For jest, it will be babel-jest
     // For `storybook` there won't be any config at all so we must give default argument of an empty object
-    const runningIn = caller((args = {}) => args.name);
+    const runningIn = api.caller((args = {}) => args.name);
+    console.debug('  - running in: ', runningIn);
+
     return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
 };
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -13,7 +13,7 @@ const includeModules = [
     'react-native-animatable',
     'react-native-reanimated',
     'react-native-picker-select',
-    '@expensify/react-native-web',
+    'react-native-web',
     'react-native-webview',
     '@react-native-picker',
     'react-native-modal',
@@ -185,8 +185,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
     resolve: {
         alias: {
             'react-native-config': 'react-web-config',
-            'react-native$': '@expensify/react-native-web',
-            'react-native-web': '@expensify/react-native-web',
+            'react-native$': 'react-native-web',
 
             // Module alias for web & desktop
             // https://webpack.js.org/configuration/resolve/#resolvealias

diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
@@ -53,17 +53,27 @@ The phone number can be formatted in different ways.
 
 ### Native Keyboards
 
-We should always set people up for success on native platforms by enabling the best keyboard for the type of input we’re asking them to provide. See [keyboardType](https://reactnative.dev/docs/0.64/textinput#keyboardtype) in the React Native documentation.
+We should always set people up for success on native platforms by enabling the best keyboard for the type of input we’re asking them to provide. See [inputMode](https://reactnative.dev/docs/textinput#inputmode) in the React Native documentation.
 
-We have a couple of keyboard types [defined](https://github.com/Expensify/App/blob/572caa9e7cf32a2d64fe0e93d171bb05a1dfb217/src/CONST.js#L357-L360) and should be used like so:
+We have a list of input modes [defined](https://github.com/Expensify/App/blob/9418b870515102631ea2156b5ea253ee05a98ff1/src/CONST.js#L765-L774) and should be used like so:
 
 ```jsx
 <InputWrapper
     InputComponent={TextInput}
-    keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
+    inputMode={CONST.INPUT_MODE.NUMERIC}
 />
 ```
 
+We also have [keyboardType](https://github.com/Expensify/App/blob/9418b870515102631ea2156b5ea253ee05a98ff1/src/CONST.js#L760-L763) and should be used for specific use cases when there is no `inputMode` equivalent of the value exist. and should be used like so:
+
+```jsx
+<InputWrapper
+    InputComponent={TextInput}
+    keyboardType={CONST.KEYBOARD_TYPE.ASCII_CAPABLE}
+/>
+```
+
+
 ### Autofill Behavior
 
 Forms should autofill information whenever possible i.e. they should work with browsers and password managers auto complete features.

diff --git a/docs/assets/images/ExpensifyHelp_RemovingMembers.png b/docs/assets/images/ExpensifyHelp_RemovingMembers.png
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.96.0</string>
+	<string>1.3.96.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.96.0</string>
+	<string>1.3.96.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.96-0",
+  "version": "1.3.96-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -60,7 +60,6 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-web": "0.18.15",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-getcanonicallocales": "^2.2.0",
     "@formatjs/intl-listformat": "^7.2.2",
@@ -163,6 +162,7 @@
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "^3.6.0",
     "react-native-vision-camera": "^2.16.2",
+    "react-native-web": "^0.19.9",
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-webview": "^11.17.2",
     "react-pdf": "^6.2.2",