diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0c89b1e..03a0647 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
android:icon="@mipmap/ic_launcher_foreground"
android:roundIcon="@mipmap/ic_launcher_foreground"
android:allowBackup="false"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:usesCleartextTraffic="true">
diff --git a/src/pages/AccessRequestRolePage.js b/src/pages/AccessRequestRolePage.js
index f5da715..958fcf5 100644
--- a/src/pages/AccessRequestRolePage.js
+++ b/src/pages/AccessRequestRolePage.js
@@ -172,12 +172,22 @@ const AccessRequestRolePage = ({ route }) => {
{isVerified && (
<>
방문 일시 선택
-
-
+ {availableDates.length === 0 && (
+ <>
+ 선택 가능한 방문일시가 없습니다.
+
+ >
+ )}
+ {availableDates.length > 0 && (
+ <>
+
+
+ >
+ )}
>
)}
diff --git a/src/pages/MainPage.js b/src/pages/MainPage.js
index cdb888b..d6d0517 100644
--- a/src/pages/MainPage.js
+++ b/src/pages/MainPage.js
@@ -3,13 +3,10 @@ import { View, Image } from 'react-native';
import { useNavigation, useRoute, useFocusEffect } from '@react-navigation/native';
import { getAccessList } from '../apis/MyAccessListApi';
import { getHospitalList } from '../apis/AccessRequestApi';
-import { getMyInfo } from '../apis/MyPageApi';
-import { mockAccessList } from '../mocks/mockAccessList';
import { useAuthStore } from '../stores/authStore';
import { useNormalAlertStore } from '../stores/alertStore';
import { styles } from './styles/MainPage.styles';
import QrCards from '../components/cards/QrCards';
-import NormalButton from '../components/buttons/NormalButton';
// TODO: 리펙토링 할 때 같은 코드는 export해서 import해서 쓰기
// 병원 Id로 병원 이름 찾기
@@ -94,7 +91,7 @@ function isQrAvailable(item) {
}
const MainPage = () => {
- const { setLoading } = useAuthStore();
+ const { setLoading, userInfo } = useAuthStore();
const showNormalAlert = useNormalAlertStore.getState().showNormalAlert;
// 임시: 상태변수로 출입 권한 제어
@@ -130,9 +127,9 @@ const MainPage = () => {
try {
// 병원, 유저 정보 병렬로 불러오기
- const [hospitalList, myInfo] = await Promise.all([getHospitalList(), getMyInfo()]);
+ const hospitalList = await getHospitalList();
setHospitalNameList(hospitalList);
- setUserName(myInfo.name);
+ setUserName(userInfo?.name || '이름 로딩 중 . . .');
const accessList = await getAccessList();
setMyAccessList(accessList);
diff --git a/src/pages/styles/AccessRequestRolePage.styles.js b/src/pages/styles/AccessRequestRolePage.styles.js
index 62ee9c9..3fad433 100644
--- a/src/pages/styles/AccessRequestRolePage.styles.js
+++ b/src/pages/styles/AccessRequestRolePage.styles.js
@@ -39,4 +39,11 @@ export const styles = StyleSheet.create({
marginTop: '10%',
marginBottom: 50,
},
+ noDatesText: {
+ ...fonts.smallText,
+ color: colors.darkGray,
+ alignSelf: 'center',
+ marginTop: '5%',
+ marginBottom: '3%',
+ },
});