From da8b4829ee11e62b4ef334f2891512bc860e2765 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 10:25:52 +0300 Subject: [PATCH 01/12] Pass additional values from ConfirmSignupForm forward as protected data --- .../AuthenticationPage/AuthenticationPage.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index c9a5579db..5268e8092 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -42,6 +42,7 @@ import { manageDisableScrolling } from '../../ducks/UI.duck'; import css from './AuthenticationPage.css'; import { FacebookLogo } from './socialLoginLogos'; +import { isEmpty } from 'lodash'; export class AuthenticationPageComponent extends Component { constructor(props) { @@ -76,7 +77,7 @@ export class AuthenticationPageComponent extends Component { submitLogin, submitSignup, confirmError, - submitSinguoWithIdp, + submitSingupWithIdp, tab, sendVerificationEmailInProgress, sendVerificationEmailError, @@ -176,7 +177,7 @@ export class AuthenticationPageComponent extends Component { const handleSubmitConfirm = values => { const { idpToken, email, firstName, lastName, idpId } = this.state.authInfo; - const { email: newEmail, firstName: newFirstName, lastName: newLastName } = values; + const { email: newEmail, firstName: newFirstName, lastName: newLastName, ...rest } = values; // Pass email, fistName or lastName to Flex API only if user has edited them // sand they can't be fetched directly from idp provider (e.g. Facebook) @@ -187,10 +188,14 @@ export class AuthenticationPageComponent extends Component { ...(newLastName !== lastName && { lastName: newLastName }), }; - submitSinguoWithIdp({ + // If the confirm form has any additional values, pass them forward as user's protected data + const protectedData = !isEmpty(rest) ? { ...rest } : null; + + submitSingupWithIdp({ idpToken, idpId, ...authParams, + protectedData, }); }; @@ -449,7 +454,7 @@ const mapStateToProps = state => { const mapDispatchToProps = dispatch => ({ submitLogin: ({ email, password }) => dispatch(login(email, password)), submitSignup: params => dispatch(signup(params)), - submitSinguoWithIdp: params => dispatch(signupWithIdp(params)), + submitSingupWithIdp: params => dispatch(signupWithIdp(params)), onResendVerificationEmail: () => dispatch(sendVerificationEmail()), onManageDisableScrolling: (componentId, disableScrolling) => dispatch(manageDisableScrolling(componentId, disableScrolling)), From 1d933ba20f399f0fae049053e15d232aff037a15 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 10:27:39 +0300 Subject: [PATCH 02/12] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54dcaaaa2..c2aff5601 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2020-XX-XX +- [fix] Pass additional values from `ConfirmSignupForm` forward as user's protected data. + [#1368](https://github.com/sharetribe/ftw-daily/pull/1368) + ## [v6.4.0] 2020-10-14 - [add] Add Facebook login as a first step towards supporting social logins and SSO in FTW. This PR From 8acead462704a6953167ec0b09b1f4a257861eff Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 10:33:10 +0300 Subject: [PATCH 03/12] Update French translations --- src/translations/fr.json | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/translations/fr.json b/src/translations/fr.json index 1137d7f1b..dd64c880a 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -17,11 +17,15 @@ "ActivityFeed.transitionExpire": "La demande de réservation a expiré. { displayName } n'a pas répondu assez vite.", "ActivityFeed.transitionRequest": "{ displayName } souhaite réserver { listingTitle }.", "ActivityFeed.transitionReview": "{ displayName } vous a laissé un commentaire. { reviewLink }", + "AuthenticationPage.confirmSignupInfoText": "Veuillez vérifier que vos informations sont correctes.", + "AuthenticationPage.confirmSignupWithIdpTitle": "S'inscrire avec {idp}", "AuthenticationPage.emailAlreadyInUse": "Un compte utilisant cette adresse email existe déjà. Peut-être pourriez-vous essayer de vous connecter ?", "AuthenticationPage.fixEmail": "Oups, une erreur dans votre email ? {fixEmailLink}.", "AuthenticationPage.fixEmailLinkText": "La corriger", "AuthenticationPage.loginFailed": "Cette combinaison d'email et mot de passe n'existe pas. Pourriez-vous vérifier et essayer de nouveau ?", "AuthenticationPage.loginLinkText": "Se connecter", + "AuthenticationPage.loginWithFacebook": "Se connecter avec Facebook", + "AuthenticationPage.or": "ou", "AuthenticationPage.resendEmail": "Vous n'avez pas reçu l'email ? {resendEmailLink}.", "AuthenticationPage.resendEmailLinkText": "Demandez le de nouveau", "AuthenticationPage.resendFailed": "L'envoi de l'email de vérification a échoué. Veuillez essayer de nouveau.", @@ -32,6 +36,7 @@ "AuthenticationPage.signupFailed": "L'inscription a échoué. Assurez vous que toutes les informations entrées sont correctes et essayez de nouveau.", "AuthenticationPage.signupFailedEmailAlreadyTaken": "Un compte utilisant cette adresse email existe déjà. Peut-être pourriez-vous essayer de vous connecter ?", "AuthenticationPage.signupLinkText": "S'inscrire", + "AuthenticationPage.signupWithFacebook": "S'inscrire avec Facebook", "AuthenticationPage.termsHeading": "Conditions d'utilisation", "AuthenticationPage.verifyEmailClose": "PLUS TARD", "AuthenticationPage.verifyEmailText": "Merci de nous avoir rejoint ! Il ne reste plus qu'une petite étape. Pour que nous puissions vous contacter, nous devons vérifier votre adresse email. Veuillez cliquer sur le lien que nous venons d'envoyer à {email}.", @@ -93,6 +98,7 @@ "CheckoutPage.initiateOrderError": "Le paiement a échoué. Veuillez retourner sur {listingLink} et essayer de nouveau. Si cela persiste, essayez de rafraîchir la page ou contactez les administrateurs de la place de marché.", "CheckoutPage.initiateOrderStripeError": "Le système de paiement a rencontré les erreurs suivantes : {stripeErrors}", "CheckoutPage.listingNotFoundError": "Hélas, cette annonce n'est plus disponible.", + "CheckoutPage.loadingData": "Chargement des données…", "CheckoutPage.paymentExpiredMessage": "Le paiement n'a pas été finalisé sous 15 minutes. Veuillez retourner à {listingLink} et essayer de nouveau.", "CheckoutPage.paymentInfo": "Vous ne serez facturé que si votre demande est acceptée par l'hôte.", "CheckoutPage.perDay": "par jour", @@ -104,6 +110,19 @@ "CheckoutPage.speculateFailedMessage": "Oups, quelque chose n'a pas fonctionné. Veuillez rafraîchir la page et essayer de nouveau.", "CheckoutPage.speculateTransactionError": "Impossible de charger les détails de la réservation.", "CheckoutPage.title": "Réserver {listingTitle}", + "ConfirmSignupForm.emailInvalid": "Une adresse email valide est requise", + "ConfirmSignupForm.emailLabel": "Email", + "ConfirmSignupForm.emailPlaceholder": "john.doe@example.com", + "ConfirmSignupForm.emailRequired": "Vous devez préciser une adresse email.", + "ConfirmSignupForm.firstNameLabel": "Prénom", + "ConfirmSignupForm.firstNamePlaceholder": "John", + "ConfirmSignupForm.firstNameRequired": "Vous devez préciser un prénom.", + "ConfirmSignupForm.lastNameLabel": "Nom de famille", + "ConfirmSignupForm.lastNamePlaceholder": "Doe", + "ConfirmSignupForm.lastNameRequired": "Vous devez préciser un nom de famille.", + "ConfirmSignupForm.signUp": "Continuer avec {idp}", + "ConfirmSignupForm.termsAndConditionsAcceptText": "En vous inscrivant, vous acceptez les {termsLink}", + "ConfirmSignupForm.termsAndConditionsLinkText": "conditions d'utilisations", "ContactDetailsForm.confirmChangesInfo": "Pour modifier votre adresse email, veuillez entrer votre mot de passe.", "ContactDetailsForm.confirmChangesTitle": "Confirmer les modifications", "ContactDetailsForm.emailInvalid": "Une adresse email valide est requise", @@ -126,6 +145,10 @@ "ContactDetailsForm.phoneLabel": "Numéro de téléphone", "ContactDetailsForm.phonePlaceholder": "Entrez votre numéro de téléphone", "ContactDetailsForm.resendEmailVerificationText": "Envoyer de nouveau l'email de vérification.", + "ContactDetailsForm.resetPasswordInfo": "Avez-vous oublié votre mot de passe ou n'en avez-vous pas encore un ?{resetPasswordLink}", + "ContactDetailsForm.resetPasswordLinkSent": "Les instructions pour réinitialiser votre mot de passe ont été envoyées à {email}.", + "ContactDetailsForm.resetPasswordLinkText": "Envoyer les instructions de réinitialisation.", + "ContactDetailsForm.resendPasswordLinkText": "Renvoyer les instructions.", "ContactDetailsForm.saveChanges": "Enregistrer les modifications", "ContactDetailsForm.tooManyVerificationRequests": "Trop d'email de vérification ont été envoyés.", "ContactDetailsPage.heading": "Mes informations de contact", @@ -434,6 +457,10 @@ "PasswordChangeForm.passwordRequired": "Le mot de passe actuel est requis.", "PasswordChangeForm.passwordTooLong": "Le mot de passe ne doit pas contenir plus de {maxLength} caractères", "PasswordChangeForm.passwordTooShort": "Le mot de passe doit contenir au moins {minLength} caractères", + "PasswordChangeForm.resetPasswordInfo": "Avez-vous oublié votre mot de passe ou n'en avez-vous pas encore un ?{resetPasswordLink}", + "PasswordChangeForm.resetPasswordLinkSent": "Les instructions pour réinitialiser votre mot de passe ont été envoyées à {email}.", + "PasswordChangeForm.resetPasswordLinkText": "Envoyer les instructions de réinitialisation.", + "PasswordChangeForm.resendPasswordLinkText": "Renvoyer les instructions.", "PasswordChangeForm.saveChanges": "Enregistrer les modifications", "PasswordChangePage.heading": "Mon mot de passe", "PasswordChangePage.title": "Mot de passe", @@ -477,7 +504,7 @@ "PaymentMethodsForm.billingDetailsNamePlaceholder": "Entrez votre nom…", "PaymentMethodsForm.paymentCardDetails": "Détails de la carte de paiement", "PaymentMethodsForm.genericError": "Erreur dans les informations de paiement. Veuillez essayer de nouveau.", - "PaymentMethodsForm.confirmCardPaymentError": "Nous n'avons pas pu certifier votre moyen de paiement. Veuillez vérifier vos informations et essayer de nouveau.", + "PaymentMethodsForm.confirmCardPaymentError": "Nous n'avons pas pu valider votre méthode de paiement. Veuillez vérifier vos informations et essayer de nouveau.", "PaymentMethodsForm.infoText": "J'autorise Saunatime à envoyer des instructions à l'institution financière ayant fourni ma carte bancaire pour prélever des paiements depuis mon compte, en accord avec les termes d'utilisations avec vous.", "PaymentMethodsForm.paymentHeading": "Paiement", "PaymentMethodsPage.heading": "Moyens de paiement", @@ -843,7 +870,7 @@ "StripePaymentForm.billingDetailsNamePlaceholder": "Entrez votre nom…", "StripePaymentForm.confirmPaymentError": "Le paiement a été réalisé mais nous n'avons pu confirmer la réservation. Veuillez essayez de réserver de nouveau ! Si la réservation n'est pas confirmée dans les temps, le paiement sera entièrement remboursé.", "StripePaymentForm.genericError": "Impossible de traiter ces détails de paiement. Veuillez essayer de nouveau.", - "StripePaymentForm.confirmCardPaymentError": "Nous n'avons pu authentifier votre méthode de paiement. Veuillez vérifier vos détails d'authentifications et essayer de nouveau.", + "StripePaymentForm.confirmCardPaymentError": "Nous n'avons pas pu valider votre méthode de paiement. Veuillez vérifier vos informations et essayer de nouveau.", "StripePaymentForm.messageHeading": "Message", "StripePaymentForm.messageLabel": "Prenez un moment dire quelques mots au propriétaire {messageOptionalText}", "StripePaymentForm.messageOptionalText": "• optionel", @@ -918,6 +945,7 @@ "StripeConnectAccountForm.createStripeAccountFailedWithStripeError": "Oups, quelque chose s'est mal passé. Le message d'erreur fourni par Stripe est : \"{stripeMessage}\"", "StripeConnectAccountForm.individualAccount": "Je suis un particulier", "StripeConnectAccountForm.createStripeAccountLinkFailed": "Oups, quelque chose n'a pas fonctionné. Veuillez contacter les administrateurs de la place de marché.", + "StripeConnectAccountForm.createStripeAccountLinkFailedWithStripeError": "Oups, quelque chose n'a pas fonctionné. Stripe a fourni le message d'erreur suivant : \"{stripeMessage}\"", "StripeConnectAccountForm.loadingStripeAccountData": "Récupération des détails de paiement…", "StripeConnectAccountForm.stripeToSText": "En enregistrant les informations, vous acceptez le {stripeConnectedAccountTermsLink}", "StripeConnectAccountForm.stripeConnectedAccountTermsLink": "Stripe Connected Account Agreement", From 6610612c30000786243ab3c0953d7d28657edc25 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 10:34:23 +0300 Subject: [PATCH 04/12] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2aff5601..03888bca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2020-XX-XX +- [add] Update French translation file (Spanish and German translations have still missing keys). + [#1369](https://github.com/sharetribe/ftw-daily/pull/1369) - [fix] Pass additional values from `ConfirmSignupForm` forward as user's protected data. [#1368](https://github.com/sharetribe/ftw-daily/pull/1368) From e59cd034ffe28780a55d462b666944f3a1043db0 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 11:03:17 +0300 Subject: [PATCH 05/12] Don't pass protected data key in ConfirmSignupForm if protected data is empty --- src/containers/AuthenticationPage/AuthenticationPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index 5268e8092..2f6f006a5 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -195,7 +195,7 @@ export class AuthenticationPageComponent extends Component { idpToken, idpId, ...authParams, - protectedData, + ...(!!protectedData && { protectedData }), }); }; From 12326377e1b4e9c39ea3faa8ab4e6fba79c82eaf Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 11:04:18 +0300 Subject: [PATCH 06/12] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03888bca2..8e3944900 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2020-XX-XX +- [fix] Don't pass protected data key through `ConfirmSignupForm` if protected data is empty. + [#1370](https://github.com/sharetribe/ftw-daily/pull/1370) - [add] Update French translation file (Spanish and German translations have still missing keys). [#1369](https://github.com/sharetribe/ftw-daily/pull/1369) - [fix] Pass additional values from `ConfirmSignupForm` forward as user's protected data. From cd8ad1a46deac9f8ac47d8cbdb9a0e96b4151777 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 11:23:54 +0300 Subject: [PATCH 07/12] Add new Stripe countries --- .../StripeBankAccountTokenInputField.util.js | 5 +++ src/stripe-config.js | 42 ++++++++++++++++++- src/translations/en.json | 5 +++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js index e638940ea..5b2932dff 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js @@ -165,6 +165,9 @@ export const mapInputsToStripeAccountKeys = (country, values) => { switch (country) { case 'AT': case 'BE': + case 'BG': + case 'CY': + case 'CZ': case 'DK': case 'EE': case 'FI': @@ -176,9 +179,11 @@ export const mapInputsToStripeAccountKeys = (country, values) => { case 'LV': case 'LT': case 'LU': + case 'MT': case 'NL': case 'PL': case 'PT': + case 'RO': case 'SK': case 'SI': case 'ES': diff --git a/src/stripe-config.js b/src/stripe-config.js index f656058a6..895852068 100644 --- a/src/stripe-config.js +++ b/src/stripe-config.js @@ -21,7 +21,7 @@ export const defaultMCC = '5734'; Stripe only supports payments in certain countries, see full list at https://stripe.com/global -You can find the bank account formats from https://stripe.com/docs/connect/payouts#formats +You can find the bank account formats from https://stripe.com/docs/connect/payouts-bank-accounts */ export const stripeCountryDetails = [ @@ -50,6 +50,14 @@ export const stripeCountryDetails = [ iban: true, }, }, + { + //Bulgraia + code: 'BG', + currency: 'BGN', + accountConfig: { + iban: true, + }, + }, { // Canada code: 'CA', @@ -60,6 +68,22 @@ export const stripeCountryDetails = [ accountNumber: true, }, }, + { + //Cyprus + code: 'CY', + currency: 'EUR', + accountConfig: { + iban: true, + }, + }, + { + // Czech Republic + code: 'CZ', + currency: 'CZK', + accountConfig: { + iban: true, + }, + }, { // Denmark code: 'DK', @@ -171,6 +195,14 @@ export const stripeCountryDetails = [ iban: true, }, }, + { + // Malta + code: 'MT', + currency: 'EUR', + accountConfig: { + iban: true, + }, + }, { // Mexico code: 'MX', @@ -219,6 +251,14 @@ export const stripeCountryDetails = [ iban: true, }, }, + { + // Romania + code: 'RO', + currency: 'RON', + accountConfig: { + iban: true, + }, + }, { // Singapore code: 'SG', diff --git a/src/translations/en.json b/src/translations/en.json index c0ac9dae3..5122b7529 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -911,7 +911,10 @@ "StripeConnectAccountForm.countryNames.AT": "Austria", "StripeConnectAccountForm.countryNames.AU": "Australia", "StripeConnectAccountForm.countryNames.BE": "Belgium", + "StripeConnectAccountForm.countryNames.BG": "Bulgaria", "StripeConnectAccountForm.countryNames.CA": "Canada", + "StripeConnectAccountForm.countryNames.CY": "Cyprus", + "StripeConnectAccountForm.countryNames.CZ": "Czech Republic", "StripeConnectAccountForm.countryNames.CH": "Switzerland", "StripeConnectAccountForm.countryNames.DE": "Germany", "StripeConnectAccountForm.countryNames.GR": "Greece", @@ -928,12 +931,14 @@ "StripeConnectAccountForm.countryNames.LT": "Lithuania", "StripeConnectAccountForm.countryNames.LV": "Latvia", "StripeConnectAccountForm.countryNames.LU": "Luxembourg", + "StripeConnectAccountForm.countryNames.MT": "Malta", "StripeConnectAccountForm.countryNames.MX": "Mexico", "StripeConnectAccountForm.countryNames.NL": "Netherlands", "StripeConnectAccountForm.countryNames.NO": "Norway", "StripeConnectAccountForm.countryNames.NZ": "New Zealand", "StripeConnectAccountForm.countryNames.PL": "Poland", "StripeConnectAccountForm.countryNames.PT": "Portugal", + "StripeConnectAccountForm.countryNames.RO": "Romania", "StripeConnectAccountForm.countryNames.SE": "Sweden", "StripeConnectAccountForm.countryNames.SI": "Slovenia", "StripeConnectAccountForm.countryNames.SK": "Slovakia", From ffb4aca869539666b65fe8d812743b9662050c6b Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 11:37:49 +0300 Subject: [PATCH 08/12] Reorder BANK_CODE & BRANCH_CODE in UI --- .../StripeBankAccountTokenInputField.util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js index 5b2932dff..ab82c7b23 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.util.js @@ -38,10 +38,10 @@ export const BANK_ACCOUNT_INPUTS = [ TRANSIT_NUMBER, INSTITUTION_NUMBER, CLEARING_CODE, - BRANCH_NAME, - BRANCH_CODE, BANK_NAME, BANK_CODE, + BRANCH_NAME, + BRANCH_CODE, SORT_CODE, ROUTING_NUMBER, ACCOUNT_OWNER_NAME, From a7941b00c3bd9d356ebbcfd0b6d6cd859344a64b Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Fri, 16 Oct 2020 11:26:34 +0300 Subject: [PATCH 09/12] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e3944900..0fd5cb542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2020-XX-XX +- [add] Add new Stripe countires Bulgaria, Cyprus, Czech Republic, Malta and Romania to the + `StripeConnectAccountForm`. Also reorder BANK_CODE & BRANCH_CODE in UI to more logical order. + [#1371](https://github.com/sharetribe/ftw-daily/pull/1371) - [fix] Don't pass protected data key through `ConfirmSignupForm` if protected data is empty. [#1370](https://github.com/sharetribe/ftw-daily/pull/1370) - [add] Update French translation file (Spanish and German translations have still missing keys). From ef49f19730ae86dca91811a0beecfe6476b97038 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Tue, 20 Oct 2020 13:58:17 +0300 Subject: [PATCH 10/12] Fix typo --- src/ducks/Auth.duck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ducks/Auth.duck.js b/src/ducks/Auth.duck.js index db11c1ecf..3c5414517 100644 --- a/src/ducks/Auth.duck.js +++ b/src/ducks/Auth.duck.js @@ -55,7 +55,7 @@ const initialState = { signupInProgress: false, // confirm (create use with idp) - confirmErro: null, + confirmError: null, confirmInProgress: false, }; From 9ff880ac768ceaecb64ab6dfef1964ff8ab5892d Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Tue, 20 Oct 2020 13:58:29 +0300 Subject: [PATCH 11/12] v6.4.1 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd5cb542..cbcc1a66e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2020-XX-XX +## [v6.4.1] 2020-10-20 + - [add] Add new Stripe countires Bulgaria, Cyprus, Czech Republic, Malta and Romania to the `StripeConnectAccountForm`. Also reorder BANK_CODE & BRANCH_CODE in UI to more logical order. [#1371](https://github.com/sharetribe/ftw-daily/pull/1371) @@ -24,6 +26,8 @@ way to update this template, but currently, we follow a pattern: - [fix] Pass additional values from `ConfirmSignupForm` forward as user's protected data. [#1368](https://github.com/sharetribe/ftw-daily/pull/1368) + [v6.4.1]: https://github.com/sharetribe/ftw-daily/compare/v6.4.0...v6.4.1 + ## [v6.4.0] 2020-10-14 - [add] Add Facebook login as a first step towards supporting social logins and SSO in FTW. This PR diff --git a/package.json b/package.json index 981b8bbee..be8e98edb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "6.4.0", + "version": "6.4.1", "private": true, "license": "Apache-2.0", "dependencies": { From 92a0f4cfe1c5ec5cd54a5728ccde01a543fb8813 Mon Sep 17 00:00:00 2001 From: Jenni Laakso Date: Tue, 20 Oct 2020 14:10:35 +0300 Subject: [PATCH 12/12] Update changelog and package.json --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98dc8eace..91ee9c211 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,22 @@ https://github.com/sharetribe/flex-template-web/ ## Upcoming version 2020-XX-XX +## [v8.4.1] 2020-10-20 + +### Updates from upstream (FTW-daily v6.4.1) + +- [add] Add new Stripe countires Bulgaria, Cyprus, Czech Republic, Malta and Romania to the + `StripeConnectAccountForm`. Also reorder BANK_CODE & BRANCH_CODE in UI to more logical order. + [#1371](https://github.com/sharetribe/ftw-daily/pull/1371) +- [fix] Don't pass protected data key through `ConfirmSignupForm` if protected data is empty. + [#1370](https://github.com/sharetribe/ftw-daily/pull/1370) +- [add] Update French translation file (Spanish and German translations have still missing keys). + [#1369](https://github.com/sharetribe/ftw-daily/pull/1369) +- [fix] Pass additional values from `ConfirmSignupForm` forward as user's protected data. + [#1368](https://github.com/sharetribe/ftw-daily/pull/1368) + + [v8.4.1]: https://github.com/sharetribe/ftw-hourly/compare/v8.4.0...v8.4.1 + ## [v8.4.0] 2020-10-15 ### Updates from upstream (FTW-daily v6.4.0) diff --git a/package.json b/package.json index e8c6f787e..5cc2f4164 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "8.4.0", + "version": "8.4.1", "private": true, "license": "Apache-2.0", "dependencies": {