diff --git a/package-lock.json b/package-lock.json index 46a1f4be5ba6ac0f6f8b0f1f607480fd1e634ff9..3a289d8e25564637578bf8e3a86d62f882ada0a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9905,9 +9905,9 @@ }, "dependencies": { "ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true } } @@ -11401,9 +11401,9 @@ }, "dependencies": { "ws": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", - "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" } } }, diff --git a/src/App/index.tsx b/src/App/index.tsx index a7ec193d869bca60adab23eb3dd7965ee7ea552f..93c5e65ee34ba9a0a98c8146c7f460c65bdde62f 100644 --- a/src/App/index.tsx +++ b/src/App/index.tsx @@ -73,7 +73,7 @@ declare global { type AlertType = { illustration?: ImageSourcePropType; - message?: string; + message?: string | Element; } type SetAlertType = React.Dispatch> @@ -141,7 +141,7 @@ const navigationTheme = { const App = () => { console.disableYellowBox = true; const [cache, cacheDispatch] = useReducer(cacheReducer, initialCacheState); - const [token, setToken] = useState(); + const [token, setToken] = useState(); const [user, setUser] = useState(); const [shouldLoading, setShouldLoading] = useState(false); @@ -192,7 +192,10 @@ const App = () => { // Token is not valid setAlert({ illustration: WonderingIllustration, - message: "Akun anda belum diaktifkan, silakan hubungi \nppticabangkotadepok@gmail.com", + message: <> + {"Akun anda belum aktif, silahkan hubungi\n"} + ppticabangkotadepok@gmail.com + , }) setToken('') } diff --git a/src/scenes/ContactInvestigationFormStep1/index.tsx b/src/scenes/ContactInvestigationFormStep1/index.tsx index 10c810eb0949ba64aad03aa7c2d19633142ba2cb..0c9d4ba180c67ae43883639f9beea264c10910b4 100644 --- a/src/scenes/ContactInvestigationFormStep1/index.tsx +++ b/src/scenes/ContactInvestigationFormStep1/index.tsx @@ -21,7 +21,7 @@ import initialCacheState from 'contexts/AppContext/cache'; const ButtonRow = styled.View` margin-top: 30px; - margin-bottom: 12px; + margin-bottom: 48px; display: flex; justify-content: flex-end; `; diff --git a/src/scenes/FinishPage/OfficerSignupFormFinishPage/index.tsx b/src/scenes/FinishPage/OfficerSignupFormFinishPage/index.tsx index 410bd679c5a536f56c9ba4692a53fff964f79321..5bb46c69eb85097e003e6e11a9f54c35d7c09f12 100644 --- a/src/scenes/FinishPage/OfficerSignupFormFinishPage/index.tsx +++ b/src/scenes/FinishPage/OfficerSignupFormFinishPage/index.tsx @@ -34,7 +34,7 @@ const OfficerSignupFormFinishPage = () => { Bila ada pertanyaan silahkan kirim ke alamat email - pengurus@ppti.id + ppticabangkotadepok@gmail.com diff --git a/src/scenes/OfficerSignupFormGoogleSignin/index.tsx b/src/scenes/OfficerSignupFormGoogleSignin/index.tsx index 9ea490dbabb21e8d74699355eba70de4db058a41..8d460fcceef8009dae8ec57e8bb6ea25ccb22406 100644 --- a/src/scenes/OfficerSignupFormGoogleSignin/index.tsx +++ b/src/scenes/OfficerSignupFormGoogleSignin/index.tsx @@ -166,7 +166,7 @@ const OfficerSignupFormGoogleSignin = () => { district: translateError(errors.district[0] || ""), sub_district: translateError(errors.sub_district[0] || ""), }) - } else if (response.status === 500) { + } else if (response.status === 500 || response.status === 400) { if (response.data.includes("IntegrityError")) { setServerHasError(false); } else {