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
2 changes: 2 additions & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4982,6 +4982,8 @@ const translations = {
limit: 'Limit',
limitType: 'Typ begrenzen',
name: 'Name',
disabledApprovalForSmartLimitError:
'Bitte aktivieren Sie Genehmigungen unter <strong>Workflows > Genehmigungen hinzufügen</strong>, bevor Sie intelligente Limits einrichten',
},
deactivateCardModal: {
deactivate: 'Deaktivieren',
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4964,6 +4964,7 @@ const translations = {
limit: 'Limit',
limitType: 'Limit type',
name: 'Name',
disabledApprovalForSmartLimitError: 'Please enable approvals in <strong>Workflows > Add approvals</strong> before setting up smart limits',
},
deactivateCardModal: {
deactivate: 'Deactivate',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5223,6 +5223,7 @@ const translations = {
limit: 'Limite',
limitType: 'Tipo de limite',
name: 'Nombre',
disabledApprovalForSmartLimitError: 'Por favor, habilita las aprobaciones en <strong>Flujos de trabajo > Aprobaciones</strong> antes de configurar los límites inteligentes',
Comment thread
arosiclair marked this conversation as resolved.
},
deactivateCardModal: {
deactivate: 'Desactivar',
Expand Down
2 changes: 2 additions & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4997,6 +4997,8 @@ const translations = {
limit: 'Limite',
limitType: 'Limiter le type',
name: 'Nom',
disabledApprovalForSmartLimitError:
'Veuillez activer les approbations dans <strong>Workflows > Ajouter des approbations</strong> avant de configurer les limites intelligentes',
},
deactivateCardModal: {
deactivate: 'Désactiver',
Expand Down
1 change: 1 addition & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4996,6 +4996,7 @@ const translations = {
limit: 'Limite',
limitType: 'Tipo di limite',
name: 'Nome',
disabledApprovalForSmartLimitError: 'Abilita le approvazioni in <strong>Flussi di lavoro > Aggiungi approvazioni</strong> prima di impostare i limiti intelligenti',
},
deactivateCardModal: {
deactivate: 'Disattiva',
Expand Down
1 change: 1 addition & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4975,6 +4975,7 @@ const translations = {
limit: '制限',
limitType: 'タイプを制限',
name: '名前',
disabledApprovalForSmartLimitError: 'スマートリミットを設定する前に、<strong>ワークフロー > 承認を追加</strong>で承認を有効にしてください',
},
deactivateCardModal: {
deactivate: '無効化',
Expand Down
1 change: 1 addition & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4998,6 +4998,7 @@ const translations = {
limit: 'Limiet',
limitType: 'Limiettype',
name: 'Naam',
disabledApprovalForSmartLimitError: 'Schakel goedkeuringen in <strong>Workflows > Goedkeuringen toevoegen</strong> in voordat u slimme limieten instelt',
},
deactivateCardModal: {
deactivate: 'Deactiveren',
Expand Down
1 change: 1 addition & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4987,6 +4987,7 @@ const translations = {
limit: 'Limit',
limitType: 'Typ limitu',
name: 'Imię',
disabledApprovalForSmartLimitError: 'Proszę włączyć zatwierdzenia w <strong>Przepływy pracy > Dodaj zatwierdzenia</strong> przed skonfigurowaniem inteligentnych limitów',
},
deactivateCardModal: {
deactivate: 'Dezaktywuj',
Expand Down
2 changes: 2 additions & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4993,6 +4993,8 @@ const translations = {
limit: 'Limite',
limitType: 'Tipo de limite',
name: 'Nome',
disabledApprovalForSmartLimitError:
'Por favor, ative as aprovações em <strong>Fluxos de Trabalho > Adicionar aprovações</strong> antes de configurar os limites inteligentes',
},
deactivateCardModal: {
deactivate: 'Desativar',
Expand Down
1 change: 1 addition & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4909,6 +4909,7 @@ const translations = {
limit: '限制',
limitType: '限制类型',
name: '名称',
disabledApprovalForSmartLimitError: '请在<strong>工作流程 > 添加审批</strong>中启用审批,然后再设置智能限制',
},
deactivateCardModal: {
deactivate: '停用',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,15 @@ function ConfirmationStep({policyID, backTo, stepNames, startStepIndex}: Confirm
const {isOffline} = useNetwork();
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`, {canBeMissing: true});
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true});
const validateError = getLatestErrorMessageField(issueNewCard);
const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false);
const data = issueNewCard?.data;
const isSuccessful = issueNewCard?.isSuccessful;
const defaultFundID = useDefaultFundID(policyID);
const hasApprovalError = !!policy?.errorFields?.approvalMode;
const isAddApprovalEnabled = policy?.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL && !hasApprovalError;
const shouldDisableSubmitButton = !isAddApprovalEnabled && data?.limitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART;

const submitButton = useRef<View>(null);

Expand Down Expand Up @@ -77,7 +81,7 @@ function ConfirmationStep({policyID, backTo, stepNames, startStepIndex}: Confirm
issueExpensifyCard(defaultFundID, policyID, CONST.COUNTRY.US, validateCode, data);
};

const errorMessage = getLatestErrorMessage(issueNewCard);
const errorMessage = getLatestErrorMessage(issueNewCard) || (shouldDisableSubmitButton ? translate('workspace.card.issueNewCard.disabledApprovalForSmartLimitError') : '');

const editStep = (step: IssueNewCardStep) => {
setIssueNewCardStepAndData({step, isEditing: true, policyID});
Expand Down Expand Up @@ -143,7 +147,8 @@ function ConfirmationStep({policyID, backTo, stepNames, startStepIndex}: Confirm
buttonRef={submitButton}
message={errorMessage}
isAlertVisible={!!errorMessage}
isDisabled={isOffline}
isDisabled={isOffline || shouldDisableSubmitButton}
isMessageHtml={shouldDisableSubmitButton}
isLoading={issueNewCard?.isLoading}
onSubmit={() => setIsValidateCodeActionModalVisible(true)}
buttonText={translate('workspace.card.issueCard')}
Expand Down
Loading