Skip to content

Commit 2cb2d1f

Browse files
danzhaaspaypaldanzhaaspaypal
authored
chore: cut release (#1016)
2 parents dfe439b + 85910dc commit 2cb2d1f

12 files changed

+90
-25
lines changed

‎Jenkinsfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ pipeline {
1111
BRANCH_NAME = sh(returnStdout: true, script: 'echo $GIT_BRANCH | sed "s#origin/##g"').trim()
1212
GIT_COMMIT_MESSAGE = sh(returnStdout: true, script: 'git log -1 --pretty=%B').trim()
1313
GIT_COMMIT_HASH = GIT_COMMIT.take(7)
14-
15-
// Assumes commit messages follow this format: chore(release): 1.49.1 [skip ci]
16-
VERSION = sh(returnStdout: true, script: "echo $GIT_COMMIT_MESSAGE | cut -d ':' -f2 | cut -d '[' -f1").trim()
1714
}
1815

1916
stages {
@@ -34,8 +31,10 @@ pipeline {
3431
steps {
3532
script {
3633
if (GIT_COMMIT_MESSAGE.contains('chore(release)')) {
34+
// Assumes commit messages follow this format: chore(release): 1.49.1 [skip ci]
35+
env.VERSION=GIT_COMMIT_MESSAGE.replaceAll(".*\\:|\\[.*", "");
3736
// Stage tags can only contain alphnumeric characters and underscores
38-
VERSION=VERSION.replace('.', '_')
37+
env.VERSION=VERSION.replace('.', '_').trim();
3938
env.stageBundleId='up_stage_v' + VERSION + '_' + GIT_COMMIT_HASH
4039
withCredentials([usernamePassword(credentialsId: 'web-cli-creds', passwordVariable: 'SVC_ACC_PASSWORD', usernameVariable: 'SVC_ACC_USERNAME')]) {
4140
sh '''
@@ -45,7 +44,7 @@ pipeline {
4544
web notify "$stageBundleId"
4645
git checkout -- dist
4746
'''
48-
}
47+
}
4948
}
5049
}
5150
}

‎src/components/modal/v2/parts/LoadingShimmer.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const LoadingShimmer = ({ numOffers = 3, offerCountry }) => {
1717
return (
1818
<div id={index} className="accordion__container shimmer">
1919
<div className="accordion__row">
20-
<button className="accordion__header-container" type="button">
20+
<div className="accordion__header-container loading">
2121
<div className="offer__field-loading" style={{ width: '60%' }} />
2222
<div className="offer__field-loading" style={{ width: '30%' }} />
23-
</button>
23+
</div>
2424
</div>
2525
</div>
2626
);

‎src/components/modal/v2/styles/components/_loading-shimmer.scss‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,20 @@
6161
}
6262
}
6363

64-
.accordion__container {
65-
&:first-child {
66-
&.shimmer {
67-
margin-top: 25px;
64+
.accordion {
65+
&__header-container {
66+
&.loading {
67+
width: auto;
68+
}
69+
}
70+
&__container {
71+
&:first-child {
72+
&.shimmer {
73+
margin-top: 25px;
6874

69-
@include mobile {
70-
margin-top: 8px;
75+
@include mobile {
76+
margin-top: 8px;
77+
}
7178
}
7279
}
7380
}

‎src/server/locale/FR/mutations/gpl.js‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ export default {
1010
styles: [
1111
textWrap(textSize * 43, textSize, 'FR'),
1212
messageLogoWidth(false, textSize * 4, textSize * 1.25),
13-
setLogoTop(textSize * 20)
13+
setLogoTop(textSize * 20),
14+
`@media screen and (min-width: ${textSize * 11.5}px) {
15+
.message__messaging span.br {
16+
white-space: normal;
17+
}
18+
}`
1419
],
1520
logo: Logo.PP_PAYPAL.COLOR,
1621
headline: [
@@ -25,7 +30,16 @@ export default {
2530
[
2631
'logo.type:primary && logo.position:right',
2732
({ textSize }) => ({
28-
styles: [setLogoTop(textSize * 40), messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25)],
33+
styles: [
34+
textWrap(textSize * 43, textSize, 'FR'),
35+
setLogoTop(textSize * 40),
36+
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
37+
`@media screen and (min-width: ${textSize * 11.5}px) {
38+
.message__messaging span.br {
39+
white-space: normal;
40+
}
41+
}`
42+
],
2943
headline: [
3044
{
3145
tag: 'default',
@@ -37,7 +51,15 @@ export default {
3751
[
3852
'logo.type:primary && logo.position:top',
3953
({ textSize }) => ({
40-
styles: [messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25)],
54+
styles: [
55+
// textWrap(textSize * 43, textSize, 'FR'),
56+
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
57+
`@media screen and (min-width: ${textSize * 11.5}px) {
58+
.message__messaging span.br {
59+
white-space: normal;
60+
}
61+
}`
62+
],
4163
headline: [
4264
{
4365
tag: 'default',
@@ -50,11 +72,17 @@ export default {
5072
'logo.type:alternative',
5173
({ textSize }) => ({
5274
styles: [
53-
textWrap(textSize * 34, textSize, 'FR'),
75+
textWrap(textSize * 39, textSize, 'FR'),
5476
altNoWrap(textSize * 10.6),
5577
messageLogoWidth(textSize * 1.75, textSize * 4, textSize * 1.25)
5678
],
57-
logo: Logo.PP_PAYPAL.COLOR[0]
79+
logo: Logo.PP_PAYPAL.COLOR[0],
80+
headline: [
81+
{
82+
tag: 'default',
83+
br: ['€']
84+
}
85+
]
5886
})
5987
],
6088
[
@@ -71,7 +99,7 @@ export default {
7199
headline: [
72100
{
73101
tag: 'default',
74-
br: ['frais', 'achats'],
102+
br: ['frais', 'achats', '€'],
75103
replace: [
76104
['€.', '€'],
77105
['éligibles.', 'éligibles']
@@ -83,7 +111,14 @@ export default {
83111
[
84112
'logo.type:inline',
85113
({ textSize }) => ({
86-
styles: [`.message__logo { width: ${textSize * 4}px }`],
114+
styles: [
115+
`.message__logo { width: ${textSize * 4}px }`,
116+
`@media screen and (min-width: ${textSize * 11.5}px) {
117+
.message__messaging span.br {
118+
white-space: normal;
119+
}
120+
}`
121+
],
87122
logo: Logo.NO_PP_MONOGRAM.COLOR,
88123
headline: [
89124
{

‎src/server/locale/FR/mutations/gplq.js‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,24 @@ export default {
2525
[
2626
'logo.type:primary && logo.position:right',
2727
({ textSize }) => ({
28-
styles: [setLogoTop(textSize * 24), messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25)]
28+
styles: [
29+
textWrap(textSize * 31, textSize, 'FR'),
30+
setLogoTop(textSize * 24),
31+
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25)
32+
]
2933
})
3034
],
3135
[
3236
'logo.type:primary && logo.position:top',
3337
({ textSize }) => ({
34-
styles: [messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25)]
38+
styles: [
39+
messageLogoWidth(textSize * 6, textSize * 4, textSize * 1.25),
40+
`@media screen and (min-width: ${textSize * 11.5}px) {
41+
.message__messaging span.br {
42+
white-space: normal;
43+
}
44+
}`
45+
]
3546
})
3647
],
3748
[
@@ -50,8 +61,14 @@ export default {
5061
],
5162
[
5263
'logo.type:none',
53-
() => ({
54-
styles: [],
64+
({ textSize }) => ({
65+
styles: [
66+
`@media screen and (min-width: ${textSize * 11.5}px) {
67+
.message__messaging span.br {
68+
white-space: normal;
69+
}
70+
}`
71+
],
5572
logo: false,
5673
headline: [
5774
{
@@ -65,7 +82,14 @@ export default {
6582
[
6683
'logo.type:inline',
6784
({ textSize }) => ({
68-
styles: [`.message__logo { width: ${textSize * 4}px }`],
85+
styles: [
86+
`.message__logo { width: ${textSize * 4}px }`,
87+
`@media screen and (min-width: ${textSize * 11.5}px) {
88+
.message__messaging span.br {
89+
white-space: normal;
90+
}
91+
}`
92+
],
6993
logo: Logo.NO_PP_MONOGRAM.COLOR,
7094
headline: [
7195
{

‎tests/functional/snapshots/FR/DEV000000FRPL/text/logo.type-primary_text.position-left-200-snap.png‎

153 Bytes
Loading

‎tests/functional/snapshots/US/DEV0000000PSZ/modal/flex,wid-411,amt-undef_EZP-and-NI-tabs-click-snap.png‎

38.1 KB
Loading

‎tests/functional/snapshots/US/DEV0000000PSZ/modal/flex,wid-411,amt-undef_apply-now-button-to-credit-application-login-snap.png‎

38 KB
Loading

‎tests/functional/snapshots/US/DEV0000000PSZ/modal/flex,wid-411,amt-undef_esc-key-modal-close-snap.png‎

6.3 KB
Loading

‎tests/functional/snapshots/US/DEV0000000PSZ/modal/flex,wid-411,amt-undef_ezp-x-button-closes-modal-snap.png‎

6.3 KB
Loading

0 commit comments

Comments
 (0)