diff --git a/app/assets/stylesheets/preact/onboarding-modal.scss b/app/assets/stylesheets/preact/onboarding-modal.scss
index 1c903719c..0640d5abd 100644
--- a/app/assets/stylesheets/preact/onboarding-modal.scss
+++ b/app/assets/stylesheets/preact/onboarding-modal.scss
@@ -43,6 +43,20 @@
}
}
+// terms and conditions view
+.terms-and-conditions-wrapper {
+ $content-height: 358px;
+
+ button {
+ @extend .crayons-btn;
+ }
+ .terms-and-conditions-content {
+ height: $content-height;
+ overflow-y: scroll;
+ margin-top: 10px;
+ }
+}
+
// window background
.onboarding-body {
-moz-background-size: cover;
@@ -369,7 +383,7 @@ $onboarding-user-selected-hover: rgba(71, 85, 235, 0.2);
.user-name {
font-size: $fs-base;
}
-
+
.user-info {
width: 100%;
}
diff --git a/app/javascript/onboarding/__tests__/Onboarding.test.jsx b/app/javascript/onboarding/__tests__/Onboarding.test.jsx
index 6d4966662..2c5c6ad67 100644
--- a/app/javascript/onboarding/__tests__/Onboarding.test.jsx
+++ b/app/javascript/onboarding/__tests__/Onboarding.test.jsx
@@ -16,14 +16,14 @@ function flushPromises() {
return new Promise((resolve) => setImmediate(resolve));
}
-function initializeSlides(currentSlide, dataUser = null, mockData = null) {
+function initializeSlides(currentSlide, userData = null, mockData = null) {
+ document.body.setAttribute('data-user', userData);
const onboardingSlides = deep();
if (mockData) {
fetch.once(mockData);
}
- document.body.setAttribute('data-user', dataUser);
onboardingSlides.setState({ currentSlide });
return onboardingSlides;
@@ -74,15 +74,19 @@ describe('', () => {
profile_image_url: 'dev.jpg',
},
]);
- const dataUser = JSON.stringify({
- followed_tag_names: ['javascript'],
- });
+ const getUserData = () =>
+ JSON.stringify({
+ followed_tag_names: ['javascript'],
+ profile_image_90: 'mock_url_link',
+ name: 'firstname lastname',
+ username: 'username',
+ });
describe('IntroSlide', () => {
let onboardingSlides;
beforeEach(() => {
- onboardingSlides = initializeSlides(0);
+ onboardingSlides = initializeSlides(0, getUserData());
});
test('renders properly', () => {
@@ -127,7 +131,7 @@ describe('', () => {
};
beforeEach(() => {
- onboardingSlides = initializeSlides(1, dataUser);
+ onboardingSlides = initializeSlides(1, getUserData());
});
test('renders properly', () => {
@@ -191,7 +195,7 @@ describe('', () => {
document.body.appendChild(meta);
beforeEach(() => {
- onboardingSlides = initializeSlides(2, dataUser);
+ onboardingSlides = initializeSlides(2, getUserData());
});
test('renders properly', () => {
@@ -224,7 +228,7 @@ describe('', () => {
document.body.appendChild(meta);
beforeEach(() => {
- onboardingSlides = initializeSlides(3, dataUser);
+ onboardingSlides = initializeSlides(3, getUserData());
});
test('renders properly', () => {
@@ -275,7 +279,7 @@ describe('', () => {
let onboardingSlides;
beforeEach(async () => {
- onboardingSlides = initializeSlides(4, dataUser, fakeTagsResponse);
+ onboardingSlides = initializeSlides(4, getUserData(), fakeTagsResponse);
await flushPromises();
});
@@ -313,7 +317,7 @@ describe('', () => {
let onboardingSlides;
beforeEach(async () => {
- onboardingSlides = initializeSlides(5, dataUser, fakeUsersResponse);
+ onboardingSlides = initializeSlides(5, getUserData(), fakeUsersResponse);
await flushPromises();
});
@@ -348,7 +352,7 @@ describe('', () => {
let onboardingSlides;
beforeEach(() => {
- onboardingSlides = initializeSlides(6);
+ onboardingSlides = initializeSlides(6, getUserData());
});
test('renders properly', () => {
diff --git a/app/javascript/onboarding/__tests__/__snapshots__/Onboarding.test.jsx.snap b/app/javascript/onboarding/__tests__/__snapshots__/Onboarding.test.jsx.snap
index de8d88bc5..334d90c64 100644
--- a/app/javascript/onboarding/__tests__/__snapshots__/Onboarding.test.jsx.snap
+++ b/app/javascript/onboarding/__tests__/__snapshots__/Onboarding.test.jsx.snap
@@ -148,7 +148,7 @@ preact-render-spy (1 nodes)
-