Fakultas Ilmu Komputer UI

Commit 50a74332 authored by Zafir Rasyidi Taufik's avatar Zafir Rasyidi Taufik
Browse files

Merge branch 'zafir/polishing-coldfix' into 'staging'

Polishing coldfix

See merge request !9
parents 27ff03ff c25c9830
Pipeline #82560 passed with stages
in 36 minutes and 23 seconds
......@@ -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=="
}
}
},
......
......@@ -73,7 +73,7 @@ declare global {
type AlertType = {
illustration?: ImageSourcePropType;
message?: string;
message?: string | Element;
}
type SetAlertType = React.Dispatch<React.SetStateAction<AlertType>>
......@@ -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<string>();
const [user, setUser] = useState();
const [shouldLoading, setShouldLoading] = useState<boolean>(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: <>
<Text> {"Akun anda belum aktif, silahkan hubungi\n"} </Text>
<Text color='#0DCE66'> ppticabangkotadepok@gmail.com </Text>
</>,
})
setToken('')
}
......
......@@ -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;
`;
......
......@@ -34,7 +34,7 @@ const OfficerSignupFormFinishPage = () => {
Bila ada pertanyaan silahkan kirim ke alamat email
</Text>
<Text color='#0DCE66' fontSize={subNoticeSize} isBold={true}>
pengurus@ppti.id
ppticabangkotadepok@gmail.com
</Text>
</FieldControl>
</ContainerContent>
......
......@@ -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 {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment