fix merge conflict

abdel-h66 · Aug 29, 2023 · fd28e88 · fd28e88
2 parents 998e56c + d84006f
commit fd28e88
Show file tree

Hide file tree

Showing 127 changed files with 6,506 additions and 9,048 deletions.
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 1001035704
-        versionName "1.3.57-4"
+        versionCode 1001035801
+        versionName "1.3.58-1"
     }
 
     flavorDimensions "default"

diff --git a/assets/images/new-expensify-dev.svg b/assets/images/new-expensify-dev.svg
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
@@ -24,7 +24,7 @@ const propTypes = {
 };
 
 // After
-type Props = {
+type ComponentProps = {
   isVisible: boolean;
   // Consider it as required unless you have proof that it is indeed an optional prop.
   confirmText: string; // vs. confirmText?: string;
@@ -115,7 +115,7 @@ type Input = {
 
 type Size = "small" | "medium" | "large";
 
-type Props = {
+type ComponentProps = {
   unknownData: string[];
 
   // It's not possible to infer the data as it can be anything because of reasons X, Y and Z.

diff --git a/contributingGuides/TS_STYLE.md b/contributingGuides/TS_STYLE.md
@@ -83,6 +83,28 @@ type Foo = {
     type Color = "red" | "blue" | "green";
     ```
 
+  - Use `{ComponentName}Props` pattern for prop types.
+
+    ```ts
+    // BAD
+    type Props = {
+      // component's props
+    };
+
+    function MyComponent({}: Props) {
+      // component's code
+    }
+
+    // GOOD
+    type MyComponentProps = {
+      // component's props
+    };
+
+    function MyComponent({}: MyComponentProps) {
+      // component's code
+    }
+    ```
+
   - For generic type parameters, use `T` if you have only one type parameter. Don't use the `T`, `U`, `V`... sequence. Make type parameter names descriptive, each prefixed with `T`.
 
     > Prefix each type parameter name to distinguish them from other types.

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.57</string>
+	<string>1.3.58</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.57.4</string>
+	<string>1.3.58.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.57</string>
+	<string>1.3.58</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.57.4</string>
+	<string>1.3.58.1</string>
 </dict>
 </plist>