Fix bad merge

Expensify · Nov 8, 2021 · a9c2221 · a9c2221
1 parent ed92a7b
commit a9c2221
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
@@ -54,7 +54,7 @@ const LocalePicker = (props) => {
                     return;
                 }
 
-                setLocale()
+                setLocale();
             }}
             items={_.values(localesToLanguages)}
             size={props.size}

diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -155,7 +155,7 @@ const IdentityForm = (props) => {
                         </View>
                         <View style={[styles.flex1]}>
                             <StatePicker
-                                value={state}
+                                value={props.state}
                                 onChange={value => props.onFieldChange('addressState', value)}
                                 errorText={props.errors.state ? props.translate('bankAccount.error.addressState') : ''}
                                 hasError={Boolean(props.errors.state)}

diff --git a/src/pages/workspace/withFullPolicy.js b/src/pages/workspace/withFullPolicy.js
@@ -80,13 +80,13 @@ export default function (WrappedComponent) {
 
         previousRoute = lodashGet(currentRoute, 'path', '');
 
-        const {forwardedRef, policy, ...rest} = props;
+        const rest = _.omit(props, ['forwardedRef', 'policy']);
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
-                ref={forwardedRef}
-                policy={policy}
+                ref={props.forwardedRef}
+                policy={props.policy}
             />
         );
     };