Merge branch 'dev'
This commit is contained in:
commit
8205fee420
7 files changed
+9
-32
No files matched your search
@@ -65,7 +65,6 @@ type Bird = {
|
||||
publicProfileEnabled: boolean;
|
||||
memorializedAt: string | null;
|
||||
memorializedOn: string | null;
|
||||
memorialNote: string | null;
|
||||
notifyOnMemorialDay: boolean;
|
||||
createdAt: string;
|
||||
latestWeightGrams: number | null;
|
||||
@@ -335,7 +334,6 @@ type PublicBirdProfile = {
|
||||
|
||||
type MemorializeBirdFormState = {
|
||||
memorializedOn: string;
|
||||
memorialNote: string;
|
||||
notifyOnMemorialDay: boolean;
|
||||
};
|
||||
|
||||
@@ -856,7 +854,6 @@ const emptyVeterinaryInfoForm: VeterinaryInfoFormState = {
|
||||
|
||||
const emptyMemorializeBirdForm = (): MemorializeBirdFormState => ({
|
||||
memorializedOn: new Date().toISOString().slice(0, 10),
|
||||
memorialNote: '',
|
||||
notifyOnMemorialDay: false,
|
||||
});
|
||||
|
||||
@@ -6996,14 +6993,6 @@ function App() {
|
||||
required
|
||||
/>
|
||||
</label>
|
||||
<label className="wide-field">
|
||||
Memorial note
|
||||
<textarea
|
||||
rows={3}
|
||||
value={memorializeBirdForm.memorialNote}
|
||||
onChange={(event) => setMemorializeBirdForm({ ...memorializeBirdForm, memorialNote: event.target.value })}
|
||||
/>
|
||||
</label>
|
||||
<div className="button-row care-form-actions">
|
||||
<button className="danger-button" type="submit" disabled={memorializingBird || activeMembership?.role !== 'owner'}>
|
||||
{memorializingBird ? 'Memorializing...' : `Memorialize ${selectedBird.name}`}
|
||||
|
||||
Reference in new issue
Block a user