Merge branch 'master' into feature/update-default-decimal-places

CHANGELOG.md

@@ -36,6 +36,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Update savebar design - #690 by @dominik-zeglen
 - Add metadata to orders - #688 by @dominik-zeglen
 - Add lazyload to locales - #692 by @eaglesemanation
+- Fix not closed address update modal with two confirmations - #699 by @orzechdev
 - Update schema with PositiveDecimal type - #695 by @AlicjaSzu
 
 ## 2.10.1

src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx

@@ -80,7 +80,7 @@ const OrderAddressEditDialog: React.FC<OrderAddressEditDialogProps> = props => {
   return (
     <Dialog onClose={onClose} open={open} classes={{ paper: classes.overflow }}>
       <Form initial={address} onSubmit={handleSubmit}>
-        {({ change, data, submit }) => {
+        {({ change, data }) => {
           const handleCountrySelect = createSingleAutocompleteSelectHandler(
             change,
             setCountryDisplayName,
@@ -118,7 +118,6 @@ const OrderAddressEditDialog: React.FC<OrderAddressEditDialogProps> = props => {
                   transitionState={confirmButtonState}
                   color="primary"
                   variant="contained"
-                  onClick={submit}
                   type="submit"
                 >
                   <FormattedMessage {...buttonMessages.confirm} />

src/orders/views/OrderDetails/OrderDetailsMessages.tsx

@@ -160,6 +160,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
           defaultMessage: "Order successfully updated"
         })
       });
+      closeModal();
     }
   };
   const handleDraftUpdate = (data: OrderDraftUpdate) => {