Merge branch 'develop'
This commit is contained in:
@@ -292,7 +292,8 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
|
||||
color: state.isFocused ? "black" : styles.color,
|
||||
}),
|
||||
}}
|
||||
isDisabled={disabled}
|
||||
// editing country manager should only be available for dev/admin
|
||||
isDisabled={!['developer', 'admin'].includes(loggedInUser.type)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -103,7 +103,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
|
||||
<label className="font-normal text-base text-mti-gray-dim">Choose a .xlsx file containing e-mails</label>
|
||||
<label className="font-normal text-base text-mti-gray-dim">Choose an Excel file containing e-mails</label>
|
||||
<Button onClick={openFilePicker} isLoading={isLoading} disabled={isLoading}>
|
||||
{filesContent.length > 0 ? filesContent[0].name : "Choose a file"}
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user