djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Marcin Gębala 2020-09-09 11:33:54 +02:00 committed by GitHub
commit 984e794fd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -36,6 +36,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Update savebar design - #690 by @dominik-zeglen - Update savebar design - #690 by @dominik-zeglen
- Add metadata to orders - #688 by @dominik-zeglen - Add metadata to orders - #688 by @dominik-zeglen
- Add lazyload to locales - #692 by @eaglesemanation - 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 - Update schema with PositiveDecimal type - #695 by @AlicjaSzu
## 2.10.1 ## 2.10.1

3
src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx
View file

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

1
src/orders/views/OrderDetails/OrderDetailsMessages.tsx
View file

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