diff --git a/app/(app)/manual-tasks/[id].tsx b/app/(app)/manual-tasks/[id].tsx
index a54770e..27cd8ce 100644
--- a/app/(app)/manual-tasks/[id].tsx
+++ b/app/(app)/manual-tasks/[id].tsx
@@ -61,7 +61,7 @@ export default function ManualTaskDetailScreen() {
 
   const { data: task, isLoading, refetch } = useQuery({
     queryKey: ['manual-task', id],
-    queryFn: () => api.get(`/api/v1/manual-tasks/${id}`).then(r => r.data),
+    queryFn: () => api.get(`/api/v1/manual-tasks/${id}`).then(r => r.data?.data ?? r.data),
     staleTime: 0,
   });
 
diff --git a/app/(app)/remittances/[id].tsx b/app/(app)/remittances/[id].tsx
index b24d04d..bb906d2 100644
--- a/app/(app)/remittances/[id].tsx
+++ b/app/(app)/remittances/[id].tsx
@@ -25,7 +25,7 @@ export default function RemittanceDetailScreen() {
 
   const { data, isLoading } = useQuery({
     queryKey: ['remittance', id],
-    queryFn: () => api.get(`/api/v1/remittances/${id}`).then(r => r.data),
+    queryFn: () => api.get(`/api/v1/remittances/${id}`).then(r => r.data?.data ?? r.data),
   });
 
   if (isLoading) {
diff --git a/services/api.ts b/services/api.ts
index 2987cd3..ca20eba 100644
--- a/services/api.ts
+++ b/services/api.ts
@@ -11,7 +11,7 @@ export const api = axios.create({
 });
 
 api.interceptors.request.use(async (config) => {
-  const token = await SecureStore.getItemAsync('fiberops_token');
+  const token = await SecureStore.getItemAsync(STORAGE_KEYS.TOKEN);
   if (token) {
     config.headers.Authorization = `Bearer ${token}`;
   }
@@ -22,7 +22,7 @@ api.interceptors.response.use(
   (response) => response,
   async (error) => {
     if (error.response?.status === 401) {
-      await SecureStore.deleteItemAsync('fiberops_token');
+      await SecureStore.deleteItemAsync(STORAGE_KEYS.TOKEN);
       await SecureStore.deleteItemAsync('fiberops_tenant');
     }
     return Promise.reject(error);