Merge branch 'main' into fabric

# Conflicts:
#	app.config.js
#	package.json
#	src/App.native.tsx
#	src/view/com/modals/Waitlist.tsx
#	src/view/com/util/forms/DateInput.tsx
#	src/view/com/util/forms/PostDropdownBtn.tsx
#	yarn.lock
This commit is contained in:
Hailey
2024-03-10 17:44:22 -07:00
64 changed files with 1568 additions and 654 deletions
-4
View File
@@ -20,7 +20,6 @@ import * as ReportModal from './report/Modal'
import * as AppealLabelModal from './AppealLabel'
import * as DeleteAccountModal from './DeleteAccount'
import * as ChangeHandleModal from './ChangeHandle'
import * as WaitlistModal from './Waitlist'
import * as InviteCodesModal from './InviteCodes'
import * as AddAppPassword from './AddAppPasswords'
import * as ContentFilteringSettingsModal from './ContentFilteringSettings'
@@ -109,9 +108,6 @@ export function ModalsContainer() {
} else if (activeModal?.name === 'change-handle') {
snapPoints = ChangeHandleModal.snapPoints
element = <ChangeHandleModal.Component {...activeModal} />
} else if (activeModal?.name === 'waitlist') {
snapPoints = WaitlistModal.snapPoints
element = <WaitlistModal.Component />
} else if (activeModal?.name === 'invite-codes') {
snapPoints = InviteCodesModal.snapPoints
element = <InviteCodesModal.Component />