Skip to content
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.

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

Merge develop into feature/rn-60 #1088

Merged
merged 235 commits into from
Mar 19, 2020
Merged
Changes from 3 commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
70f9aaa
fix(flagship): add targeted device to both Debug and Release config
Oct 6, 2018
7a33c38
feat: Write Reviews Baazarvoice implementation
pavlemilicevicbb Dec 3, 2018
380d3ca
refactor: move denormalize function to separate file
pavlemilicevicbb Dec 3, 2018
8e4d0ac
feat: Write review submission typings
pavlemilicevicbb Dec 3, 2018
e319a48
Merge branch 'master' into targeted-device-release
DavidRhodesBB Feb 8, 2019
db20c1e
Merge branch 'master' into targeted-device-release
DavidRhodesBB Feb 13, 2019
64165aa
fix: update react-native-htmlview to version 0.14.0
greenkeeper[bot] Apr 27, 2019
3d01391
Merge branch 'develop' into greenkeeper/flagship/react-native-htmlvie…
bweissbart Jun 4, 2019
01beb32
feat(fsengagement): add new carousel option and full screen background
Jul 17, 2019
dcb72aa
chore(release): publish v4.1.0
bweissbart Jul 24, 2019
b223ce8
chore: update react native cli dependency to 1.11.2
bweissbart Jul 25, 2019
722cd92
feat(fscomponents): add some option props to zoomCarousel
jcarvin Jul 25, 2019
f49960a
feat(fscomponents): add nextArrowOnBlur prop to pass through
jcarvin Jul 26, 2019
fddce73
feat(fscomponents): extend changes to non web-specific zoomcarousel
jcarvin Jul 29, 2019
db2ef06
chore: pin react-native-permissions version
bweissbart Jul 29, 2019
1d7a036
fix(fsengagement): update react-native-video
NickBurkhartBB Jul 29, 2019
0e4bcc0
fix(fsapp): Put dev menu as first screen
Cauldrath Aug 1, 2019
5afe084
chore: remove add-keys scripts in favor of more generic versions
bweissbart Aug 2, 2019
48d3297
chore: pin react-native-sensitive-info to 5.4.x
bweissbart Aug 2, 2019
cf964f9
feat(fscomponents): support more styling options for MultiCarousel
chukohsin Aug 5, 2019
d342370
feat(fscomponents): add hideZoomButton props to ZoomCarousel
chukohsin Aug 5, 2019
9c49aa7
fix: Add 'Marquis' feature to Button with title dynamically reflectin…
Oct 4, 2019
b8b8d96
chore(fscomponents): add missing typedef to modalhalfscreen component
bweissbart Oct 8, 2019
4d6f1fa
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Oct 8, 2019
f5ae87b
fix(flagship): update string replace to work in new fastfile
bweissbart Oct 8, 2019
9cf8cb1
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Oct 10, 2019
b86a581
build: upgrade deprecated webpack dev server
olexandor Oct 17, 2019
e6d64bf
fix(flagship): fix fastlane build lane
bweissbart Oct 22, 2019
ead2047
chore: tell greenkeeper to ignore more dependencies
bweissbart Oct 23, 2019
53b02c3
fix: Add itemCount to cart interface in fscommerce (#877)
olkorsia Oct 23, 2019
c72f3c0
fix: Modify the podspec version to ve 2.6.2 (#878)
Bodrus Oct 23, 2019
777e0cd
Merge branch 'develop' of https://github.com/brandingbrand/flagship i…
olexandor Oct 24, 2019
580d95e
feat(fsshopify): account data source implementation
MauricioPerezBB Oct 24, 2019
25d3073
build: upgrade deprecated webpack dev server
olexandor Oct 24, 2019
3dbff8b
Merge branch 'develop' of github.com:brandingbrand/flagship into add-…
Oct 24, 2019
9789ff3
fix: remove unnecessary checks
Oct 24, 2019
a4644c3
fix(pirateship): Remove duplicate "name" in config (#867)
Cauldrath Oct 24, 2019
639c906
Merge pull request #874 from olexandor/webpack-dev-server
Cauldrath Oct 24, 2019
b3d5306
Merge pull request #853 from olksns/add-dynamic-btn-state
Cauldrath Oct 24, 2019
1eb793f
Merge pull request #879 from bweissbart/greenkeeper-ignore
Cauldrath Oct 24, 2019
9c3d319
chore: Update react-native-masked-text
olexandor Oct 28, 2019
8a3933a
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Oct 28, 2019
f2912e1
fix: exclude kotlin intermediate build files
vancehu Oct 28, 2019
17f83d4
chore: update react-dom library
sentiurin Oct 29, 2019
e873b70
chore: Update react-native-touch-id dependency
olkorsia Oct 29, 2019
211209a
fix(flagship): Fix renaming edge case for android (#898)
nathan-sankbeil Oct 29, 2019
2405dda
fix(fsweb): Use yarn.lock for fsweb (#906)
Cauldrath Oct 29, 2019
dd63a4e
chore(release): publish v7.4.2
bweissbart Oct 29, 2019
8828c44
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Oct 30, 2019
61057e2
Merge pull request #900 from alexandrvlasov/update-react-native-touch-id
Cauldrath Oct 30, 2019
70476a5
Merge pull request #899 from sentiurin/update-react-dom
Cauldrath Oct 30, 2019
3ce8c1b
Merge pull request #897 from vancehu/patch-1
Cauldrath Oct 30, 2019
f001c3f
Merge pull request #894 from olexandor/update-react-native-masked-text
Cauldrath Oct 30, 2019
92aa97e
fix(fsweb): Lock babel runtime in package.json (#905)
Cauldrath Oct 30, 2019
9ddaf4a
chore(release): publish v7.4.3
bweissbart Oct 30, 2019
796d37b
Merge pull request #632 from brandingbrand/greenkeeper/flagship/react…
Cauldrath Oct 31, 2019
d476cbf
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Oct 31, 2019
b1ce472
Merge branch 'develop' into zoomcarousel
bweissbart Oct 31, 2019
13de2aa
chore: fix merge confict
bweissbart Oct 31, 2019
803b054
Merge branch 'develop' into multicarousel
bweissbart Oct 31, 2019
352bc2e
chore: fix merge confict
bweissbart Oct 31, 2019
4b621ca
Merge pull request #737 from chukohsin/multicarousel
Cauldrath Nov 1, 2019
512b54a
Merge branch 'develop' into zoomcarousel
Cauldrath Nov 1, 2019
53e4d8f
Merge pull request #738 from chukohsin/zoomcarousel
Cauldrath Nov 1, 2019
e52b2c7
Merge pull request #296 from pavlemilicevicbb/write-reviews
Cauldrath Nov 1, 2019
a6b5d77
Merge pull request #248 from justin-endler/targeted-device-release
Cauldrath Nov 1, 2019
577788e
Merge pull request #875 from bweissbart/fixFastlane2
Cauldrath Nov 1, 2019
7baf939
feat(fscomponents): add custom modal content logic and test view
varzaman Nov 5, 2019
c7ac05e
Merge branch 'develop' into custommodal
varzaman Nov 7, 2019
f596e60
feat(fscomponents): add condition to render custom test modal content
varzaman Nov 7, 2019
e324647
Update README.md
bweissbart Nov 7, 2019
e7bb8eb
Merge branch 'develop' into custommodal
nathan-sankbeil Nov 7, 2019
7552a0c
Merge pull request #917 from varzaman/custommodal
nathan-sankbeil Nov 7, 2019
2efdfba
chore(release): publish v7.5.0
bweissbart Nov 7, 2019
ced8e77
chore(release): publish v7.5.1
bweissbart Nov 7, 2019
68abf89
chore(release): publish v7.5.2
bweissbart Nov 8, 2019
0070ca1
chore(release): publish v7.5.3
bweissbart Nov 8, 2019
a0812aa
chore(release): publish v7.5.4
bweissbart Nov 8, 2019
a2750ab
chore(pirateship): update react-native-svg library (#889)
sentiurin Nov 8, 2019
7756591
chore: tell greenkeeper to ignore react and react native types
bweissbart Nov 8, 2019
973b36c
Merge branch 'develop' into shopifyAccountDataSource
deemaabdallah Nov 8, 2019
ab39b48
feat(fsshopify): add safe undefined handler
MauricioPerezBB Nov 12, 2019
273653b
feat(fsshopify): add safe undefined handler
MauricioPerezBB Nov 12, 2019
a2a6868
Merge pull request #881 from MauricioPerezBB/shopifyAccountDataSource
Cauldrath Nov 12, 2019
946cb86
Merge pull request #918 from brandingbrand/bweissbart-patch-1
Cauldrath Nov 13, 2019
f29ecfa
feat(flagship): Add option to only include the default env (#925)
Cauldrath Nov 14, 2019
d0fee61
chore(release): publish v7.6.0
bweissbart Nov 14, 2019
8c32930
refactor: CreditCardNumber to avoid getDerivedStateFromProps (#926)
sentiurin Nov 18, 2019
d84d831
chore: Update generating info plist (#924)
olkorsia Nov 18, 2019
55c4b61
feat(flagship): deprecate appcenter.apiconfig configuration option
bweissbart Nov 20, 2019
7101b72
chore(release): publish v7.7.0
bweissbart Nov 20, 2019
f6b6c21
chore: update dev dependencies to alleviate security issues (#932)
bweissbart Nov 20, 2019
7ab4d6d
chore(release): publish v7.7.1
bweissbart Nov 20, 2019
8f3df56
fix(fsbazaarvoice): fix review id normalizer (#936)
vancehu Nov 26, 2019
51f41c4
Update typedoc to the latest version 🚀 (#922)
greenkeeper[bot] Nov 29, 2019
1c4ceb9
Update yargs in group flagship to the latest version 🚀 (#929)
greenkeeper[bot] Nov 29, 2019
ec16cc4
Update husky to the latest version 🚀 (#930)
greenkeeper[bot] Nov 29, 2019
64b15df
chore: add error message if user runs tsc on top level (#944)
bweissbart Dec 2, 2019
8d86721
feat: update webpack dependencies
bweissbart Dec 17, 2019
b58032a
feat(fsengagement): add animated card list for demo (#954)
andyschwob Dec 17, 2019
19c7489
feat(fsengagement): add image grid component (#947)
Shaheed-Shamsi Dec 17, 2019
09da133
chore: regenerate yarn.lock
bweissbart Dec 17, 2019
8d0a7b9
Merge pull request #955 from bweissbart/security2
nathan-sankbeil Dec 18, 2019
3d51164
chore(release): publish v7.8.0
bweissbart Dec 18, 2019
abbcf03
fix(fscomponents): ModalHalfScreen listener height update (#957)
chukohsin Dec 19, 2019
7d9fc73
feat(flagship): add Android App Bundle (.aab) Support (#950)
vancehu Dec 19, 2019
7e1705e
feat(pirateship): add enagement to pirateship demo (#959)
andyschwob Dec 20, 2019
37c45ae
chore(pirateship): update provisioning profile (#960)
bweissbart Dec 30, 2019
cef3439
Update @types/yargs in group flagship to the latest version 🚀 (#962)
greenkeeper[bot] Jan 2, 2020
73cd4e9
Update replace-in-file in group flagship to the latest version 🚀 (#953)
greenkeeper[bot] Jan 2, 2020
737522f
Update sinon in group flagship to the latest version 🚀 (#961)
greenkeeper[bot] Jan 2, 2020
024fb00
Update markdownlint-cli to the latest version 🚀 (#956)
greenkeeper[bot] Jan 2, 2020
3ce1c5c
Update @types/jest to the latest version 🚀 (#911)
greenkeeper[bot] Jan 2, 2020
74a0f75
chore: explicitly install node 10 for android ci step (#972)
bweissbart Jan 9, 2020
543f724
Update husky to the latest version 🚀 (#970)
greenkeeper[bot] Jan 9, 2020
32066e3
Update @types/yargs in group flagship to the latest version 🚀 (#969)
greenkeeper[bot] Jan 9, 2020
031f0e0
chore: update markdownlint-cli to version 0.21.0
greenkeeper[bot] Jan 9, 2020
7f3214a
chore: update @types/memoize-one to version 5.1.2 (#893)
greenkeeper[bot] Jan 10, 2020
a83ff9c
chore: update @types/react-router-dom to version 5.1.2 (#910)
greenkeeper[bot] Jan 10, 2020
e52d97f
fix: android fastline syntax error due to a trailing comma
vancehu Jan 13, 2020
14852bf
Merge pull request #976 from brandingbrand/vancehu-patch-1
Cauldrath Jan 13, 2020
3ee2d5c
chore(release): publish v7.10.0
bweissbart Jan 14, 2020
ad7ac53
chore(release): publish v7.10.0
bweissbart Jan 14, 2020
c3259d7
feat(flagship): update podfile to use cocoapods cdn
bweissbart Dec 19, 2019
09fb3ce
chore: empty commit to restart coveralls
bweissbart Jan 15, 2020
120213c
Merge pull request #979 from bweissbart/pods2
Cauldrath Jan 15, 2020
334ccb5
Merge branch 'develop' of github.com:brandingbrand/flagship into develop
bweissbart Jan 15, 2020
57874d3
chore(release): publish v8.0.0
bweissbart Jan 15, 2020
b01cfd2
refactor(fscomponents): FLAGSHIP-59 Updating To Function Component
Jan 16, 2020
0bc26f3
refactor(fscomponents): FLAGSHIP-58 Updating To Function Component
Jan 16, 2020
80c8110
fix(fscomponents): FLAGSHIP-64 - Make Shelf a function component
hearsh Jan 16, 2020
cf660c9
refactor(fscomponents): FLAGSHIP-60 Updating To Function Component
Jan 17, 2020
d172d25
feat(fscomponents): Add formik, yup to fscomponents and LoginForm
varzaman Jan 14, 2020
28c7769
Merge branch 'develop' into formiklogin
varzaman Jan 17, 2020
05d3e3f
refactor(fscomponents): FLAGSHIP-63 - Updating To Function Component
buticm Jan 17, 2020
9195bc7
refactor(fscomponents): FLAGSHIP-50 Update to a function component
huizhuz Jan 21, 2020
813fd12
refactor(fscomponents): FLAGSHIP-49 - Make AddressForm a function com…
rosahbruno Jan 21, 2020
09ba8f3
chore(fscomponents): memoize ImageWithOverlay.tsx (#988)
griffithcaleb Jan 21, 2020
b8dcb58
chore(fscomponents): convert Loading.tsx to functional component (#983)
griffithcaleb Jan 21, 2020
e91c847
refactor(fscomponents): FLAGSHIP-51 Updating To Function Component (#…
Jan 21, 2020
82e4801
refactor(fscomponents): FLAGSHIP-69 Update to a function component
huizhuz Jan 21, 2020
0df4c95
refactor(fscomponents): FLAGSHIP-55 Updating To Function Component (#…
Jan 21, 2020
4d65cce
refactor(fscomponents): FLAGSHIP-56 Updating To Function Component (#…
Jan 21, 2020
10348bb
refactor(fscomponents): FLAGSHIP-71 Change to abstract classes
huizhuz Jan 21, 2020
a6e4b6a
refactor(fscomponents): FLAGSHIP-72 Update to a function component
huizhuz Jan 22, 2020
2605f37
refactor(fscomponents): FLAGSHIP-74 Updating to function component
rosahbruno Jan 22, 2020
d554fd6
refactor(fscomponents): FLAGSHIP-67 Update to function component
rosahbruno Jan 22, 2020
61ed1ab
Merge branch 'develop' into FLAGSHIP-50
Cauldrath Jan 22, 2020
a83146e
Merge pull request #987 from huizhuz/FLAGSHIP-50
Cauldrath Jan 22, 2020
45d777c
Merge branch 'develop' into FLAGSHIP-60
Cauldrath Jan 22, 2020
02638c3
chore(fstestproject): get test project working again
bweissbart Jan 22, 2020
3e9e662
refactor(fscomponents): FLAGSHIP-101 Adding Accessibility To Component
Jan 22, 2020
d96ea5d
chore: fix inaccurate comment
bweissbart Jan 22, 2020
e50068d
Merge pull request #990 from brandingbrand/FLAGSHIP-64
Cauldrath Jan 22, 2020
9a07bea
Merge pull request #993 from willybeans/FLAGSHIP-60
Cauldrath Jan 22, 2020
94aed4f
Merge pull request #1018 from bweissbart/testProject
Cauldrath Jan 22, 2020
1cbf3cc
Merge pull request #989 from willybeans/FLAGSHIP-59
Cauldrath Jan 22, 2020
b66346c
Merge pull request #992 from willybeans/FLAGSHIP-58
Cauldrath Jan 23, 2020
e674b6e
refactor(fscomponents): FLAGSHIP-103 Adding Accessibility To Component
Jan 23, 2020
7101788
refactor(fscomponents): FLAGSHIP-103 Adding New Translations
Jan 23, 2020
02e6353
Merge branch 'develop' into FLAGSHIP-49
bweissbart Jan 23, 2020
0d8449a
refactor(fscomponents): FLAGSHIP-65 Updating To Function Component (#…
Jan 23, 2020
7382575
refactor(fscomponents): FLAGSHIP-101 Adding New Translations ADA
Jan 23, 2020
116de7a
refactor(fscomponents): FLAGSHIP-73 Update to a function component (#…
huizhuz Jan 23, 2020
b0ae830
refactor(fscomponents): FLAGSHIP-105 Adding Accessibility To Component
buticm Jan 23, 2020
c2084e7
refactor(fscomponents): FLAGSHIP-106 Adding New Translations and ADA
Jan 23, 2020
e15595c
refactor(fscomponents): FLAGSHIP-66 Updating to function component (#…
rosahbruno Jan 23, 2020
1ebd194
refactor(fscomponents): FLAGSHIP-106 Adding Image Alt Text
Jan 23, 2020
9e6cf77
feat(fscomponents): FLAGSHIP-102 accessibility for Filter
richter31 Jan 23, 2020
ad552e3
Merge branch 'develop' into FLAGSHIP-102
richter31 Jan 23, 2020
ff2047f
refactor(fscomponents): FLAGSHIP-91 update with translations
Jan 23, 2020
0c84ebc
feat(fscomponents): FLAGSHIP-104 accessibility for Zoom carousel
richter31 Jan 23, 2020
f14bf4f
refactor(fscomponents): FLAGSHIP-88 Add translations to alert
Jan 23, 2020
14f6d8d
Merge branch 'develop' into FLAGSHIP-104
richter31 Jan 23, 2020
0679f84
refactor(fscomponents): FLAGSHIP-85 update with translations
Jan 23, 2020
f9ffb2d
refactor(fscomponents): FLAGSHIP-86 update with translations
Jan 24, 2020
1a620e6
refactor(fscomponents): FLAGSHIP-87 update with translations
Jan 24, 2020
638b466
Merge pull request #995 from varzaman/formiklogin
Cauldrath Jan 24, 2020
d44c837
Merge pull request #998 from buticm/FLAGSHIP-63
Cauldrath Jan 24, 2020
685bfad
Merge pull request #1010 from huizhuz/FLAGSHIP-69
Cauldrath Jan 24, 2020
2a999a5
Merge pull request #1012 from huizhuz/FLAGSHIP-71
Cauldrath Jan 24, 2020
6caa10d
fix(fscomponents): replace Arial with sans-serif (#1030)
chukohsin Jan 24, 2020
b73d5b4
chore(release): publish v8.1.0
bweissbart Jan 24, 2020
48cd406
Merge pull request #1015 from huizhuz/FLAGSHIP-72
Cauldrath Jan 27, 2020
5efe5f6
Merge pull request #1016 from rosahbruno/FLAGSHIP-74
Cauldrath Jan 27, 2020
338fee2
Merge pull request #1017 from rosahbruno/FLAGSHIP-67
Cauldrath Jan 27, 2020
f6ad0f9
Merge branch 'develop' into FLAGSHIP-49
rosahbruno Jan 27, 2020
e6f55d7
refactor(fscomponents): FLAGSHIP-49 Updating to function component
rosahbruno Jan 27, 2020
e7fec04
Merge pull request #1006 from rosahbruno/FLAGSHIP-49
Cauldrath Jan 28, 2020
e6c29e7
Merge pull request #1019 from willybeans/FLAGSHIP-101
Cauldrath Jan 28, 2020
ba77c3c
Merge pull request #1024 from buticm/FLAGSHIP-105
Cauldrath Jan 28, 2020
d24d51b
Merge pull request #1027 from willybeans/FLAGSHIP-88
Cauldrath Jan 29, 2020
d90acca
Merge pull request #1025 from willybeans/FLAGSHIP-91
Cauldrath Jan 29, 2020
12e25f8
Merge pull request #1028 from willybeans/FLAGSHIP-85
Cauldrath Jan 29, 2020
bead919
Merge pull request #1029 from willybeans/FLAGSHIP-86
Cauldrath Jan 29, 2020
db98bad
Merge pull request #1031 from willybeans/FLAGSHIP-87
Cauldrath Jan 29, 2020
9b27607
Merge pull request #1026 from richter31/FLAGSHIP-104
Cauldrath Jan 29, 2020
2cb6a46
fix: adds translations for hints
richter31 Jan 29, 2020
366ead5
Merge pull request #1023 from richter31/FLAGSHIP-102
Cauldrath Jan 29, 2020
ae898b9
refactor(fscomponents): FLAGSHIP-106 Adding Accessibility To Component
Jan 30, 2020
8da62da
Merge branch 'develop' into FLAGSHIP-106
Jan 30, 2020
9f015f3
refactor(fscomponents): FLAGSHIP-103 resolving conflicts
Jan 30, 2020
71fdff1
Merge pull request #1022 from willybeans/FLAGSHIP-106
Cauldrath Jan 30, 2020
1aa8a01
Merge pull request #1021 from willybeans/FLAGSHIP-103
Cauldrath Jan 30, 2020
e348b98
refactor(fscomponents): FLAGSHIP-96 Add Translation To Component
Jan 31, 2020
f28991d
refactor(fscomponents): FLAGSHIP-95 Add Translation To Component
Jan 31, 2020
14d4c46
Merge pull request #1040 from willybeans/FLAGSHIP-96
Cauldrath Jan 31, 2020
60f1677
Merge pull request #1041 from willybeans/FLAGSHIP-95
Cauldrath Jan 31, 2020
eb6c099
refactor(fscomponents): FLAGSHIP-97 Add Translations To Component
Feb 3, 2020
3bd5e0b
fix(pirateship): Update tab index for cart count (#1039)
Cauldrath Feb 3, 2020
2d61478
refactor(fscomponents): FLAGSHIP-89 Add Translations To Component
Feb 3, 2020
040933d
fix(fscomponents): Move story files to all live in the same folder (#…
Cauldrath Feb 3, 2020
f991e24
Merge pull request #1043 from willybeans/FLAGSHIP-97
Cauldrath Feb 4, 2020
fe2de57
Merge pull request #1044 from willybeans/FLAGSHIP-89
Cauldrath Feb 4, 2020
e5088c1
feat(fslocator): add customized search functionality
chukohsin Feb 6, 2020
3319a64
refactor(fscomponents): FLAGSHIP-98 Add Translations To Component
Feb 6, 2020
cdf5755
refactor(fscomponents): FLAGSHIP-94 Add Translations To Component
Feb 6, 2020
97b1610
Merge pull request #1051 from chukohsin/fslocator_customizedSearch
Cauldrath Feb 6, 2020
385dc5f
Merge pull request #1053 from willybeans/FLAGSHIP-98
Cauldrath Feb 6, 2020
1c7d029
Merge branch 'develop' into FLAGSHIP-94
Feb 7, 2020
5e4b6e6
Merge pull request #1054 from willybeans/FLAGSHIP-94
Cauldrath Feb 7, 2020
c62e60c
chore(release): publish v8.2.0
bweissbart Feb 10, 2020
7d84d58
feat(fsbazaarvoice): Expand review data source
varzaman Feb 11, 2020
5859747
refactor(fsbazaarvoice): simplify param code since qs strips out unde…
varzaman Feb 11, 2020
3c15095
Merge pull request #1061 from varzaman/reviewdatasource
Cauldrath Feb 11, 2020
b3299e9
chore(fsnetwork): fix fsnetwork unit tests
bweissbart Feb 12, 2020
dd058f0
Merge pull request #1063 from bweissbart/fixTests
nathan-sankbeil Feb 12, 2020
d460e4d
chore(release): publish v8.3.0
bweissbart Feb 12, 2020
01108e1
test(fsnetwork): fix network test with new url (#1074)
bweissbart Mar 2, 2020
a705b04
feat(fsbazaarvoice): Add recommended ratio to normalized data (#1077)
varzaman Mar 9, 2020
4d84e75
chore(release): publish v8.4.0
bweissbart Mar 9, 2020
e8b6a24
chore(deps): bump acorn from 5.7.3 to 5.7.4 (#1083)
dependabot[bot] Mar 16, 2020
5718e19
Merge remote-tracking branch 'upstream/feature/rn-60' into merge_3_18_20
Cauldrath Mar 18, 2020
7db681a
feat(fsapp): Allow setting the application root tag (#1082)
Cauldrath Mar 18, 2020
846d837
Merge remote-tracking branch 'upstream/develop' into merge_3_18_20
Cauldrath Mar 19, 2020
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
20 changes: 11 additions & 9 deletions packages/fscomponents/src/components/LoginForm.tsx
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ import * as t from 'tcomb-form-native';
import { emailRegex } from '../lib/email';
import { Form, FormLabelPosition } from './Form';
import { Button } from './Button';
import FSI18n, { translationKeys } from '@brandingbrand/fsi18n';
const componentTranslationKeys = translationKeys.flagship.loginForm;

export interface LoginFormProps {
/**
@@ -66,9 +68,9 @@ const EmailType = t.refinement(t.String, (str: string) => {

EmailType.getValidationErrorMessage = (s: string) => {
if (!s) {
return 'Email is required';
return FSI18n.string(componentTranslationKeys.emailReq);
} else {
return `${s} is not an valid email`;
return s + FSI18n.string(componentTranslationKeys.emailNotValid);
}
};

@@ -91,23 +93,23 @@ export class LoginForm extends Component<LoginFormProps, LoginFormState> {

this.fieldsOptions = {
emailAddress: {
label: 'Email',
placeholder: 'Email',
label: FSI18n.string(componentTranslationKeys.email),
placeholder: FSI18n.string(componentTranslationKeys.email),
returnKeyType: 'next',
autoCorrect: false,
autoCapitalize: 'none',
keyboardType: 'email-address',
onSubmitEditing: () => this.focusField('password'),
error: 'Please enter a valid email'
error: FSI18n.string(componentTranslationKeys.emailError)
},
password: {
label: 'Password',
placeholder: 'Password',
label: FSI18n.string(componentTranslationKeys.password),
placeholder: FSI18n.string(componentTranslationKeys.password),
returnKeyType: 'next',
autoCorrect: false,
autoCapitalize: 'none',
secureTextEntry: true,
error: 'Please enter your password'
error: FSI18n.string(componentTranslationKeys.passwordError)
},
...props.fieldsOptions
};
@@ -158,7 +160,7 @@ export class LoginForm extends Component<LoginFormProps, LoginFormState> {
onChange={this.handleChange}
/>
<Button
title={submitText || 'Submit'}
title={submitText || FSI18n.string(componentTranslationKeys.submit)}
onPress={this.handleSubmit}
style={submitButtonStyle}
/>
4 changes: 4 additions & 0 deletions packages/fsi18n/src/translations/en.ts
Original file line number Diff line number Diff line change
@@ -314,7 +314,11 @@ export const keys: FSTranslationKeys = {
},
loginForm: {
email: 'Email',
emailReq: 'Email is required',
emailNotValid: ' is not an valid email',
emailError: 'Please enter a valid email',
password: 'Password',
passwordError: 'Please enter your password',
submit: 'Submit'
}
}
4 changes: 4 additions & 0 deletions packages/fsi18n/src/types.ts
Original file line number Diff line number Diff line change
@@ -380,6 +380,10 @@ export interface ShareButtonTranslations<KeyType> {
}
export interface LoginFormTranslations<KeyType> {
email: KeyType;
emailReq: KeyType;
emailNotValid: KeyType;
emailError: KeyType;
password: KeyType;
passwordError: KeyType;
submit: KeyType;
}