Skip to content

Commit

Permalink
Merge pull request #1813 from ever-co/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Nov 17, 2023
2 parents e150399 + 2852c41 commit d0d4367
Show file tree
Hide file tree
Showing 31 changed files with 2,215 additions and 1,467 deletions.
276 changes: 260 additions & 16 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,283 @@
{
"version": "0.2",
"language": "en",
"caseSensitive": false,
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
"words": [
"appdev",
"APPSTORE",
"barcodes",
"binutils",
"buildjet",
"cacheable",
"camelcase",
"Chatwoot",
"cloc",
"cloudinary",
"clsxm",
"commitlint",
"compodoc",
"dummyimage",
"envalid",
"everco",
"everteamsdesktop",
"exposdk",
"gcloud",
"graphicsmagick",
"gtag",
"headlessui",
"heroicons",
"Huhn",
"icnsutils",
"JITSU",
"kanban",
"libappindicator",
"mathieudutour",
"ncipollo",
"passcode",
"plasmo",
"precommit",
"RECAPTCHA",
"setuptools",
"snyk",
"stylelint",
"svgs",
"tailwindcss",
"Timesheet",
"Vercel",
"buildjet",
"vcpu",
"libappindicator",
"binutils",
"icnsutils",
"graphicsmagick",
"setuptools",
"gcloud",
"mathieudutour",
"ncipollo",
"Huhn",
"appdev",
"Chatwoot",
"gtag",
"APPSTORE"
"Vercel",
"HUBSTAFF",
"UPWORK",
"runned",
"Timeslot",
"Isssue",
"datas",
"Changemail",
"Lask",
"publicactive",
"Formated",
"Btns",
"RESERVERD",
"shandow",
"UIUX",
"xlight",
"domutils",
"domhandler",
"hyperscript",
"nocheck",
"locatio",
"falsey",
"unhang",
"popperjs",
"Isssue",
"inital",
"FULLNAME",
"extramenu",
"iuser",
"Pourtcent",
"Reconds",
"Pourtcent",
"combx",
"fomated",
"Hanlder",
"cmdk",
"sitekey",
"Loadtasks",
"Accordian",
"lgcard",
"dvalue",
"Codacy",
"codecov",
"huntr",
"Gitter",
"shadcn",
"Repobeats",
"Codementor",
"xlcard",
"wght",
"worksace",
"appkey",
"jitsi",
"accepte",
"Parens",
"pako",
"embla",
"excalidraw",
"Lngs",
"Transpiles",
"wasabisys",
"apistage",
"flaticon",
"VERSONS",
"Tongatapu",
"Moresby",
"Pago",
"Kosrae",
"Kiritimati",
"Fakaofo",
"Enderbury",
"Efate",
"Propf",
"mappagination",
"INAPP",
"INFOTMATION",
"nimg",
"strock",
"ISSUETYPE",
"borde",
"imlement",
"Invitatio",
"Synk",
"nimg",
"capitaliz",
"nimg",
"Settingfilter",
"recieve",
"Opena",
"TRANSFERT",
"choos",
"Darkmode",
"recieve",
"Vefified",
"Uturn",
"insted",
"Cmbx",
"hidde",
"invitationid",
"cheched",
"Dropown",
"imodal",
"Signle",
"Filder",
"outclick",
"Filder",
"skey",
"outclick",
"Xlarge",
"Permisson",
"noreferrer",
"errr",
"Instanciate",
"Varibales",
"ciphertext",
"discrepenancy",
"unoffic",
"implem",
"asel",
"Togger",
"Organizatio",
"Combox",
"unchild",
"signoff",
"Settingfilter",
"X",
"stackoverflow",
"payperiod",
"billrate",
"tnode",
"localstorage",
"millisencods",
"taskid",
"creatoe",
"setrole",
"lastest",
"immediatly",
"Verifiy",
"invdate",
"ianatz",
"uicolors",
"greppable",
"Andross",
"Bowser",
"Boilerplates",
"xcodeproj",
"gradlew",
"paren",
"iphonesimulator",
"xcworkspace",
"dropwdown",
"itask",
"xcodebuild",
"reactotron",
"fbjs",
"stylesheet",
"bootsplash",
"animatable",
"apisauce",
"grotesk",
"jsbundle",
"unimodules",
"mobx",
"typeof",
"loglevel",
"applesimutils",
"phraseapp",
"OSTYPE",
"pkill",
"yellowbox",
"miliseconds",
"Bugsnag",
"Neue",
"Defaul",
"Reactotron's",
"Worspace",
"Funtion",
"tinvitations",
"Authentificate",
"screenstatus",
"withteam",
"Invitions",
"lastlog",
"STMP",
"statut",
"statsus",
"simplecast",
"Ffeeds",
"smalltext",
"Pressible",
"Pressable",
"deserunt",
"longpress",
"endregion",
"checkcircleo",
"Entypo",
"Charaters",
"Ionicons",
"ellipsize",
"unasigned",
"progess",
"Icontent",
"arrowleft",
"Descrption",
"Swith",
"Chane",
"Plaholder",
"firstname",
"Isvalid",
"Chane",
"checkcircle",
"exclamationcircleo",
"contaniner",
"Galery",
"clockcircleo",
"filtmembers",
"comparision",
"Jamon",
"Chami",
"Mazen",
"Heinze",
"Holmgren",
"Jamon",
"Rickert",
"Metral",
"subsquently",
"Syle",
"imagebutton",
"hwba",
"plasmohq",
"Proguard",
"horcrux",
"dimesions"
],
"useGitignore": true,
"ignorePaths": [
Expand Down Expand Up @@ -75,10 +315,14 @@
"signin",
"Chatwoot",
"CHATWOOT",
"apps/web/lib/settings/timezones.js",
"apps/**/*.{svg,css,scss}",
"apps/web/lib/i18n/*.ts",
"apps/mobile/app/screens/DemoShowroomScreen/demos/**",
"apps/web/public/locales/**",
"apps/mobile/app/i18n/*.ts",
"apps/mobile/android/**",
"apps/mobile/ios/**"
"apps/mobile/ios/**",
"apps/desktop/i18n/**"
]
}
2 changes: 1 addition & 1 deletion apps/mobile/app/components/TeamDropdown/DropDown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const DropDown: FC<Props> = observer(function CreateTeamModal({
style={styles.teamImage}
size={40}
source={{
uri: activeTeam.image?.thumbUrl || activeTeam.logo || activeTeam.image?.fullUrl
uri: activeTeam?.image?.thumbUrl || activeTeam?.logo || activeTeam?.image?.fullUrl
}}
/>
) : (
Expand Down
6 changes: 3 additions & 3 deletions apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ const DropItem: FC<IDropItem> = observer(function DropItem({ team, changeTeam, i
return (
<View style={styles.indDropDown}>
<TouchableOpacity style={{ flexDirection: 'row', alignItems: 'center' }} onPress={() => changeTeam(team)}>
{team.image?.thumbUrl || team.logo || team.image?.fullUrl ? (
{team?.image?.thumbUrl || team?.logo || team?.image?.fullUrl ? (
<Avatar.Image
style={styles.teamImage}
size={30}
source={{ uri: team.image?.thumbUrl || team.logo || team.image?.fullUrl }}
source={{ uri: team?.image?.thumbUrl || team?.logo || team.image?.fullUrl }}
/>
) : (
<Avatar.Text
Expand All @@ -165,7 +165,7 @@ const DropItem: FC<IDropItem> = observer(function DropItem({ team, changeTeam, i
fontFamily: isActiveTeam ? typography.primary.semiBold : typography.primary.normal
}}
>
{limitTextCharaters({ text: team.name, numChars: resized ? 12 : 20 })} ({team.members.length})
{limitTextCharaters({ text: team?.name, numChars: resized ? 12 : 20 })} ({team?.members.length})
</Text>
</TouchableOpacity>
<TouchableOpacity onPress={() => navigateToSettings(team)}>
Expand Down
Loading

0 comments on commit d0d4367

Please sign in to comment.