Skip to content

Commit a718167

Browse files
authored
Merge pull request #84904 from callstack-internal/fix/84804-non-usd-api-error
Fix non-usd flow api error
2 parents 03923bb + 20e7589 commit a718167

24 files changed

Lines changed: 118 additions & 41 deletions

File tree

src/components/SubStepForms/YesNoStep.tsx

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,33 @@ type YesNoStepProps = {
2424
/** The style of the submit button */
2525
submitButtonStyles?: StyleProp<ViewStyle>;
2626

27+
/** Whether the submit button should be flex enabled, allowing it to grow and fill available space */
28+
submitFlexEnabled?: boolean;
29+
2730
/** Indicates if button should be in isLoading state */
2831
isLoading?: boolean;
32+
33+
/** Optional content rendered below the radio buttons */
34+
children?: React.ReactNode;
35+
36+
/** Optional callback fired when the radio selection changes */
37+
onValueChange?: () => void;
2938
};
3039

31-
function YesNoStep({title, description, defaultValue, onSelectedValue, submitButtonStyles, isLoading = false}: YesNoStepProps) {
40+
function YesNoStep({title, description, defaultValue, onSelectedValue, submitButtonStyles, submitFlexEnabled, isLoading = false, children, onValueChange}: YesNoStepProps) {
3241
const {translate} = useLocalize();
3342
const styles = useThemeStyles();
3443
const [value, setValue] = useState(defaultValue);
3544

3645
const handleSubmit = () => {
3746
onSelectedValue(value);
3847
};
39-
const handleSelectValue = (newValue: string) => setValue(newValue === 'true');
48+
49+
const handleSelectValue = (newValue: string) => {
50+
setValue(newValue === 'true');
51+
onValueChange?.();
52+
};
53+
4054
const options = useMemo<Choice[]>(
4155
() => [
4256
{
@@ -58,6 +72,7 @@ function YesNoStep({title, description, defaultValue, onSelectedValue, submitBut
5872
onSubmit={handleSubmit}
5973
style={[styles.mh5, styles.flexGrow1]}
6074
submitButtonStyles={submitButtonStyles}
75+
submitFlexEnabled={submitFlexEnabled}
6176
isLoading={isLoading}
6277
shouldHideFixErrorsAlert
6378
>
@@ -69,6 +84,7 @@ function YesNoStep({title, description, defaultValue, onSelectedValue, submitBut
6984
defaultCheckedValue={defaultValue.toString()}
7085
radioButtonStyle={[styles.mb6]}
7186
/>
87+
{children}
7288
</FormProvider>
7389
);
7490
}

src/languages/de.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3858,6 +3858,8 @@ ${amount} für ${merchant} – ${date}`,
38583858
`verknüpft ein ${currency}-Geschäftskonto mit der Endung ${bankAccountLastFour} mit Expensify, um Mitarbeitende in ${currency} zu bezahlen. Der nächste Schritt erfordert Unterzeichnungsinformationen von einer Führungsperson.`,
38593859
error: {
38603860
emailsMustBeDifferent: 'E-Mail-Adressen müssen unterschiedlich sein',
3861+
connectToWorkspace: (workspaceRoute: string) =>
3862+
`Bitte verbinden Sie dieses Bankkonto mit einem <a href="${workspaceRoute}">Arbeitsbereich</a> um eine Führungsperson zum Unterzeichnen einzuladen.`,
38613863
},
38623864
},
38633865
agreementsStep: {

src/languages/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3917,6 +3917,7 @@ const translations = {
39173917
`is connecting a ${currency} business bank account ending in ${bankAccountLastFour} to Expensify to pay employees in ${currency}. The next step requires signer info from a director.`,
39183918
error: {
39193919
emailsMustBeDifferent: 'Emails must be different',
3920+
connectToWorkspace: (workspaceRoute: string) => `Please connect this bank account to a <a href="${workspaceRoute}">workspace</a> to invite a director to sign.`,
39203921
},
39213922
},
39223923
agreementsStep: {

src/languages/es.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3782,6 +3782,8 @@ ${amount} para ${merchant} - ${date}`,
37823782
`está conectando una cuenta bancaria comercial en ${currency} que termina en ${bankAccountLastFour} a Expensify para pagar a los empleados en ${currency}. El siguiente paso requiere la información del firmante de un director.`,
37833783
error: {
37843784
emailsMustBeDifferent: 'Los correos electrónicos deben ser diferentes',
3785+
connectToWorkspace: (workspaceRoute: string) =>
3786+
`Por favor, conecta esta cuenta bancaria a un <a href="${workspaceRoute}">espacio de trabajo</a> para invitar a un director a firmar.`,
37853787
},
37863788
},
37873789
agreementsStep: {

src/languages/fr.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3869,6 +3869,8 @@ ${amount} pour ${merchant} - ${date}`,
38693869
`est en train de connecter un compte bancaire professionnel en ${currency} se terminant par ${bankAccountLastFour} à Expensify pour payer des employés en ${currency}. L’étape suivante nécessite les informations de signature d’un directeur.`,
38703870
error: {
38713871
emailsMustBeDifferent: 'Les e-mails doivent être différents',
3872+
connectToWorkspace: (workspaceRoute: string) =>
3873+
`Veuillez connecter ce compte bancaire à un <a href="${workspaceRoute}">espace de travail</a> pour inviter un directeur à signer.`,
38723874
},
38733875
},
38743876
agreementsStep: {

src/languages/it.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3849,6 +3849,7 @@ ${amount} per ${merchant} - ${date}`,
38493849
`sta collegando un conto bancario aziendale in ${currency} che termina con ${bankAccountLastFour} a Expensify per pagare i dipendenti in ${currency}. Il prossimo passaggio richiede le informazioni del firmatario da un direttore.`,
38503850
error: {
38513851
emailsMustBeDifferent: 'Le email devono essere diverse',
3852+
connectToWorkspace: (workspaceRoute: string) => `Per favore, collega questo conto bancario a un <a href="${workspaceRoute}">workspace</a> per invitare un direttore a firmare.`,
38523853
},
38533854
},
38543855
agreementsStep: {

src/languages/ja.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,6 +3820,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
38203820
`は、従業員への支払いを${currency}で行うため、末尾が${bankAccountLastFour}の${currency}建てビジネス銀行口座をExpensifyに接続しようとしています。次のステップでは、取締役の署名者情報が必要です。`,
38213821
error: {
38223822
emailsMustBeDifferent: 'メールアドレスは異なる必要があります',
3823+
connectToWorkspace: (workspaceRoute: string) => `この銀行口座を<a href="${workspaceRoute}">ワークスペース</a>に接続して、取締役に署名を依頼してください。`,
38233824
},
38243825
},
38253826
agreementsStep: {

src/languages/nl.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3846,6 +3846,8 @@ ${amount} voor ${merchant} - ${date}`,
38463846
`verbindt een zakelijke ${currency}-bankrekening die eindigt op ${bankAccountLastFour} met Expensify om werknemers in ${currency} te betalen. De volgende stap vereist ondertekenaarsgegevens van een directeur.`,
38473847
error: {
38483848
emailsMustBeDifferent: 'E-mails moeten verschillend zijn',
3849+
connectToWorkspace: (workspaceRoute: string) =>
3850+
`Koppel deze bankrekening alstublieft aan een <a href="${workspaceRoute}">werkruimte</a> om een directeur uit te nodigen te ondertekenen.`,
38493851
},
38503852
},
38513853
agreementsStep: {

src/languages/pl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3839,6 +3839,7 @@ ${amount} dla ${merchant} - ${date}`,
38393839
`łączy firmowe konto bankowe w ${currency} z numerem kończącym się na ${bankAccountLastFour} z Expensify, aby wypłacać wynagrodzenia pracownikom w ${currency}. Następnym krokiem jest podanie danych sygnatariusza będącego dyrektorem.`,
38403840
error: {
38413841
emailsMustBeDifferent: 'Adresy e-mail muszą być różne',
3842+
connectToWorkspace: (workspaceRoute: string) => `Proszę połączyć to konto bankowe z <a href="${workspaceRoute}">przestrzenią roboczą</a> aby zaprosić dyrektora do podpisania.`,
38423843
},
38433844
},
38443845
agreementsStep: {

src/languages/pt-BR.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3838,6 +3838,8 @@ ${amount} para ${merchant} - ${date}`,
38383838
`está conectando uma conta bancária comercial em ${currency} terminada em ${bankAccountLastFour} ao Expensify para pagar funcionários em ${currency}. A próxima etapa exige as informações de assinatura de um diretor.`,
38393839
error: {
38403840
emailsMustBeDifferent: 'Os e-mails devem ser diferentes',
3841+
connectToWorkspace: (workspaceRoute: string) =>
3842+
`Por favor, conecte esta conta bancária a um <a href="${workspaceRoute}">espaço de trabalho</a> para convidar um diretor a assinar.`,
38413843
},
38423844
},
38433845
agreementsStep: {

0 commit comments

Comments
 (0)