Skip to content

Fix add similar issue for iOS #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jordanstreiff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix add similar issue for iOS #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/connect/ConnectLocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const LessPaddingButton = styled(Button)`
padding: 0 10px;
`

const ToastContent = () => {
const ToastContent = ({ location }) => {
const { t } = useTranslation()
const history = useAppHistory()
const dispatch = useDispatch()
Expand Down Expand Up @@ -57,7 +57,7 @@ const ToastContent = () => {
<LessPaddingButton
type="button"
onClick={() => {
dispatch(duplicateIntoNewLocation())
dispatch(duplicateIntoNewLocation(location))
history.push(`/locations/init`)
}}
>
Expand Down Expand Up @@ -225,7 +225,7 @@ const ConnectLocation = ({
}
} else if (isSuccessfullyAdded) {
toastIdRef.current = toast.success(
<ToastContent locationId={locationId} />,
<ToastContent locationId={locationId} location={location} />,
{
autoClose: false,
style: { width: '100%' },
Expand Down
8 changes: 7 additions & 1 deletion src/components/connect/ConnectNewLocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ const ConnectNewLocation = () => {
// Should only happen for an artificially constructed URL
history.push('/map')
}
}, [dispatch, locationId, hasInitialView, isDesktop]) //eslint-disable-line
/*
* Mount-only: after a successful submit, locationId changes from 'new' to

@wbazant wbazant Jul 25, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment helped me understand how the change worked, thanks! I'm trying to keep the codebase relatively comment free. Can we take it out before merging? Maybe see if the doc in connectRoutes.js needs revising.

* the new location's id while this component is still mounted. Re-running
* would call initNewLocation and wipe the just-added location from Redux,
* which the success page and 'Add similar' still need.
*/
}, []) //eslint-disable-line
return null
}

Expand Down
10 changes: 9 additions & 1 deletion src/redux/locationSlice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,15 @@ const locationSlice = createSlice({
clearLocation: (state) => {
Object.assign(state, initialState)
},
duplicateIntoNewLocation: (state) => {
duplicateIntoNewLocation: (state, action) => {
/*
* The location captured when the success toast was created. Restore it
* in case something (e.g. the mobile drawer closing through /map)
* cleared the slice before the user tapped 'Add similar'.
*/

@wbazant wbazant Jul 25, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you check if changing the effect array in ConnectNewLocation is enough? This might not be necessary.

if (action.payload) {
state.location = action.payload
}
state.isLoading = false
state.isBeingEdited = false
state.locationId = 'new'
Expand Down