🧹 Cleanup Merge Conflicts, Fix Typecheck Errors

Author: Saeris

packages/app/src/app/components/CreateNewSandbox/CreateSandbox/Import/Import.tsx

@@ -116,7 +116,7 @@ export const Import = () => {
             <ButtonContainer>
               <Button
                 small
-                style={{ fontSize: 11 }}
+                css="font-size: 11"
                 onClick={() => {
                   copyToClipboard(transformedUrl);
                 }}
@@ -126,7 +126,7 @@ export const Import = () => {
               </Button>
               <Button
                 small
-                style={{ fontSize: 11 }}
+                css="font-size: 11"
                 disabled={!transformedUrl}
                 to={gitHubToSandboxUrl(url)}
               >
@@ -159,7 +159,7 @@ export const Import = () => {
               <SignInButton />
             ) : (
               <StackbitButton
-                style={{ fontSize: 11 }}
+                css="font-size: 11"
                 username={state.user.username}
               />
             )}

packages/app/src/app/components/CreateNewSandbox/CreateSandbox/Welcome/Welcome.tsx

@@ -44,7 +44,7 @@ export const Welcome = ({ goToTab }: { goToTab: (event: any) => void }) => {
         </li>
       </Features>
       <Actions>
-        <Button small style={{ fontSize: 12, width: 200 }} onClick={goToTab}>
+        <Button small css=" width: 200; font-size: 12;" onClick={goToTab}>
           Create Sandbox
         </Button>
       </Actions>

packages/app/src/app/pages/Dashboard/Content/routes/TeamView/AddTeamMember/index.tsx

@@ -114,12 +114,12 @@ export const BookmarkTemplateButton = ({ style }: IBookmarkTemplateButton) => {
             : `Bookmark Template`
         }
       >
-        {bookmarkInfos.map(({ entity: { name } }, i: number) => (
+        {(bookmarkInfos as any).map(({ entity: { name } }, i: number) => (
           <button
             type="button"
             key={name}
             // @ts-ignore
-            onClick={(e, menu) => {
+            onClick={(e: React.MouseEventHandler, menu) => {
               // TODO: find a way to pass menu so we can close it after handling our action
               handleToggleFollow(i);
               menu.hide();