Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions src/components/DistanceRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ import Button from './Button';
import styles from '../styles/styles';
import variables from '../styles/variables';
import LinearGradient from './LinearGradient';
<<<<<<< HEAD
=======
import Navigation from '../libs/Navigation/Navigation';
import ROUTES from '../ROUTES';
>>>>>>> f6fad4e (Merge pull request #25492 from Expensify/revert-24306-hayata-add-map)

const MAX_WAYPOINTS = 25;
const MAX_WAYPOINTS_TO_DISPLAY = 4;
Expand Down Expand Up @@ -71,11 +66,7 @@ function DistanceRequest({transactionID, transaction, translate}) {
const scrollContainerMaxHeight = variables.baseMenuItemHeight * MAX_WAYPOINTS_TO_DISPLAY + halfMenuItemHeight;

useEffect(() => {
<<<<<<< HEAD
if (!transaction.transactionID || !_.isEmpty(waypoints)) {
=======
if (!transactionID || !_.isEmpty(waypoints)) {
>>>>>>> f6fad4e (Merge pull request #25492 from Expensify/revert-24306-hayata-add-map)
return;
}
// Create the initial start and stop waypoints
Expand Down
6 changes: 0 additions & 6 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1587,12 +1587,6 @@ export default {
finish: 'Finish',
stop: 'Stop',
},
<<<<<<< HEAD
=======
errors: {
selectSuggestedAddress: 'Please select a suggested address',
},
>>>>>>> f6fad4e (Merge pull request #25492 from Expensify/revert-24306-hayata-add-map)
},
countrySelectorModal: {
placeholderText: 'Search to see options',
Expand Down
6 changes: 0 additions & 6 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -2074,12 +2074,6 @@ export default {
finish: 'Final',
stop: 'Parada',
},
<<<<<<< HEAD
=======
errors: {
selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida',
},
>>>>>>> f6fad4e (Merge pull request #25492 from Expensify/revert-24306-hayata-add-map)
},
countrySelectorModal: {
placeholderText: 'Buscar para ver opciones',
Expand Down