Merge branch 'new-release' into CR/form-merchant

# Conflicts:
#	src/lib/form/components/Merchant.jsx

1 files changed, 7 insertions, 3 deletions

diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx
index 9d70e8fc..97db7ed8 100644
--- a/src/lib/address/components/CreateAddress.jsx
+++ b/src/lib/address/components/CreateAddress.jsx
@@ -37,7 +37,7 @@ const CreateAddress = () => {
 
   useEffect(() => {
     const loadState = async () => {
-      let dataState = await stateApi();
+      let dataState = await stateApi({ tempo: false });
       dataState = dataState.map((state) => ({
         value: state.id,
         label: state.name,
@@ -52,7 +52,7 @@ const CreateAddress = () => {
     setValue('city', '');
     if (watchState) {
       const loadCities = async () => {
-        let dataCities = await cityApi({stateId: watchState});
+        let dataCities = await cityApi({ stateId: watchState });
         dataCities = dataCities.map((city) => ({
           value: city.id,
           label: city.name,
@@ -243,7 +243,11 @@ const CreateAddress = () => {
                 name='city'
                 control={control}
                 render={(props) => (
-                  <HookFormSelect {...props} options={cities}  disabled={!watchState}/>
+                  <HookFormSelect
+                    {...props}
+                    options={cities}
+                    disabled={!watchState}
+                  />
                 )}
               />
               <div className='text-caption-2 text-danger-500 mt-1'>