Skip to content

Commit

Permalink
Merge pull request #26708 from Expensify/neil-remove-distance-beta
Browse files Browse the repository at this point in the history
Remove distance requests beta
  • Loading branch information
Hayata Suenaga authored Sep 4, 2023
2 parents f77a5a5 + 09e4e72 commit 8150ce0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
1 change: 0 additions & 1 deletion src/CONST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ const CONST = {
TASKS: 'tasks',
THREADS: 'threads',
CUSTOM_STATUS: 'customStatus',
DISTANCE_REQUESTS: 'distanceRequests',
},
BUTTON_STATES: {
DEFAULT: 'default',
Expand Down
9 changes: 0 additions & 9 deletions src/libs/Permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,6 @@ function canUseCustomStatus(betas) {
return _.contains(betas, CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
}

/**
* @param {Array<String>} betas
* @returns {Boolean}
*/
function canUseDistanceRequests(betas) {
return _.contains(betas, CONST.BETAS.DISTANCE_REQUESTS) || canUseAllBetas(betas);
}

/**
* Link previews are temporarily disabled.
* @returns {Boolean}
Expand All @@ -112,6 +104,5 @@ export default {
canUsePolicyRooms,
canUseTasks,
canUseCustomStatus,
canUseDistanceRequests,
canUseLinkPreviews,
};
4 changes: 1 addition & 3 deletions src/pages/iou/MoneyRequestSelectorPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import ReceiptSelector from './ReceiptSelector';
import * as IOU from '../../libs/actions/IOU';
import DistanceRequestPage from './DistanceRequestPage';
import DragAndDropProvider from '../../components/DragAndDrop/Provider';
import usePermissions from '../../hooks/usePermissions';
import OnyxTabNavigator, {TopTab} from '../../libs/Navigation/OnyxTabNavigator';
import NewRequestAmountPage from './steps/NewRequestAmountPage';
import reportPropTypes from '../reportPropTypes';
Expand Down Expand Up @@ -52,7 +51,6 @@ function MoneyRequestSelectorPage(props) {
const iouType = lodashGet(props.route, 'params.iouType', '');
const reportID = lodashGet(props.route, 'params.reportID', '');
const {translate} = useLocalize();
const {canUseDistanceRequests} = usePermissions();

const title = {
[CONST.IOU.MONEY_REQUEST_TYPE.REQUEST]: translate('iou.requestMoney'),
Expand All @@ -61,7 +59,7 @@ function MoneyRequestSelectorPage(props) {
};
const isFromGlobalCreate = !reportID;
const isExpenseRequest = ReportUtils.isPolicyExpenseChat(props.report);
const shouldDisplayDistanceRequest = canUseDistanceRequests && (isExpenseRequest || isFromGlobalCreate);
const shouldDisplayDistanceRequest = isExpenseRequest || isFromGlobalCreate;

const resetMoneyRequestInfo = () => {
const moneyRequestID = `${iouType}${reportID}`;
Expand Down

0 comments on commit 8150ce0

Please sign in to comment.