Skip to content

fix: decode bank param to get all cards correctly #58101

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

Merged
merged 3 commits into from
Mar 14, 2025
Merged

fix: decode bank param to get all cards correctly #58101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a22b41e
fix: decode bank param to get all cards correctly
koko57 Mar 10, 2025
bf5be3d
fix: replace with decode in other locations
koko57 Mar 11, 2025
b0ae197
fix: eslint
koko57 Mar 11, 2025
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
3 changes: 2 additions & 1 deletion src/pages/workspace/companyCards/WorkspaceCompanyCardAccountSelectCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ type WorkspaceCompanyCardAccountSelectCardProps = PlatformStackScreenProps<Setti
function WorkspaceCompanyCardAccountSelectCardPage({route}: WorkspaceCompanyCardAccountSelectCardProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const {policyID, cardID, bank} = route.params;
const {policyID, cardID} = route.params;
const bank = decodeURIComponent(route.params.bank);
const policy = usePolicy(policyID);
const workspaceAccountID = getWorkspaceAccountID(policyID);
const [searchText, setSearchText] = useState('');
Expand Down
5 changes: 3 additions & 2 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ import {getExportMenuItem} from './utils';
type WorkspaceCompanyCardDetailsPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARD_DETAILS>;

function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPageProps) {
const {policyID, cardID, backTo, bank} = route.params;
const {policyID, cardID, backTo} = route.params;
const bank = decodeURIComponent(route.params.bank);
const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`);
const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
const workspaceAccountID = getWorkspaceAccountID(policyID);
Expand Down Expand Up @@ -73,7 +74,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
};

const updateCard = () => {
updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank);
updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank as CompanyCardFeed);
};

if (!card && !isLoadingOnyxValue(allBankCardsMetadata)) {
Expand Down
26 changes: 17 additions & 9 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import TextInput from '@components/TextInput';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as ErrorUtils from '@libs/ErrorUtils';
import {addErrorMessage} from '@libs/ErrorUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import * as PolicyUtils from '@libs/PolicyUtils';
import * as ValidationUtils from '@libs/ValidationUtils';
import {getWorkspaceAccountID} from '@libs/PolicyUtils';
import {getFieldRequiredErrors} from '@libs/ValidationUtils';
import Navigation from '@navigation/Navigation';
import type {SettingsNavigatorParamList} from '@navigation/types';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import * as CompanyCards from '@userActions/CompanyCards';
import {updateCompanyCardName} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand All @@ -27,8 +27,9 @@ import INPUT_IDS from '@src/types/form/EditExpensifyCardNameForm';
type WorkspaceCompanyCardEditCardNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARD_NAME>;

function WorkspaceCompanyCardEditCardNamePage({route}: WorkspaceCompanyCardEditCardNamePageProps) {
const {policyID, cardID, bank} = route.params;
const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
const {policyID, cardID} = route.params;
const bank = decodeURIComponent(route.params.bank);
const workspaceAccountID = getWorkspaceAccountID(policyID);
const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
const defaultValue = customCardNames?.[cardID];

Expand All @@ -37,15 +38,22 @@ function WorkspaceCompanyCardEditCardNamePage({route}: WorkspaceCompanyCardEditC
const styles = useThemeStyles();

const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>) => {
CompanyCards.updateCompanyCardName(workspaceAccountID, cardID, values[INPUT_IDS.NAME], bank, defaultValue);
updateCompanyCardName(workspaceAccountID, cardID, values[INPUT_IDS.NAME], bank, defaultValue);
Navigation.goBack();
};

const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM> => {
const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.NAME]);
const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME]);
const length = values.name.length;
if (length > CONST.STANDARD_LENGTH_LIMIT) {
ErrorUtils.addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', {length, limit: CONST.STANDARD_LENGTH_LIMIT}));
addErrorMessage(
errors,
INPUT_IDS.NAME,
translate('common.error.characterLimitExceedCounter', {
length,
limit: CONST.STANDARD_LENGTH_LIMIT,
}),
);
}
return errors;
};
Expand Down
3 changes: 2 additions & 1 deletion src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {clearAssignCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import type {CompanyCardFeed} from '@src/types/onyx';
import AssigneeStep from './AssigneeStep';
import CardNameStep from './CardNameStep';
import CardSelectionStep from './CardSelectionStep';
Expand All @@ -23,7 +24,7 @@ function AssignCardFeedPage({route, policy}: AssignCardFeedPageProps) {
const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
const currentStep = assignCard?.currentStep;

const feed = route.params?.feed;
const feed = decodeURIComponent(route.params?.feed) as CompanyCardFeed;
const backTo = route.params?.backTo;
const policyID = policy?.id;
const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate});
Expand Down