Merge branch 'staging' into refact/code-splitting

* staging: fix: hot-fix update featured project to heroOfBitcoin fix: hot-fix creation flow update fix: reward grid fix (#884) v0.1.1 fix: fix styles in funding comment box (#882) Revert "Revert "PRODUCTION PUSH"" fix: project navigation styles fix: dont cancel invoice if fundstate is in started state (#870) fix: hotfix for search Revert "PRODUCTION PUSH" feat: update no fee projects list
geyserfund · May 16, 2023 · 779a3f7 · 779a3f7
2 parents eb20d05 + 0c42f01
commit 779a3f7
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,46 @@
+## [0.1.1](https://github.com/geyserfund/geyser-app/compare/v0.1.0...v0.1.1) (2023-05-15)
+
+
+### Features
+
+* add hotjar to production ([5c18485](https://github.com/geyserfund/geyser-app/commit/5c184858f37d20f8023b9587d70a051bd11f5361))
+* Allow funder to login from funding flow ([#859](https://github.com/geyserfund/geyser-app/issues/859)) ([d53547e](https://github.com/geyserfund/geyser-app/commit/d53547e6c04a0569bd72fea7e7f837588c2b9eac)), closes [#864](https://github.com/geyserfund/geyser-app/issues/864)
+* test out hotjar for staging ([06fae45](https://github.com/geyserfund/geyser-app/commit/06fae456ed26faff0366933302100139db976fb5))
+* update featured project to orangepilljam ([563672f](https://github.com/geyserfund/geyser-app/commit/563672f5176b974487fb9dc984f9b16c26c49906))
+* update no fee projects list ([3fecbcc](https://github.com/geyserfund/geyser-app/commit/3fecbcc2972234f814eea47c0f21f704d7ded736))
+
+
+### Bug Fixes
+
+* add bold to contribution disclaimer ([240dfd4](https://github.com/geyserfund/geyser-app/commit/240dfd4003bf6e69919758d5f4c86365f9b6e174))
+* add match value for youtu.be formatted links ([bfca128](https://github.com/geyserfund/geyser-app/commit/bfca12821bc99ee6ac3eab1c9cdab0b798270ca7))
+* add missing fragments ([3d87739](https://github.com/geyserfund/geyser-app/commit/3d8773971ffb8df96b06611b34435a260139cd38))
+* display featured project ([3c998d1](https://github.com/geyserfund/geyser-app/commit/3c998d19dc7730600ed8ad94bc4ebe2c68998fe6))
+* dont cancel invoice if fundstate is in started state ([#870](https://github.com/geyserfund/geyser-app/issues/870)) ([84fecd5](https://github.com/geyserfund/geyser-app/commit/84fecd5c8428326d4f2e76d69082401ebfe3ad5b))
+* entry view ([8ff7b61](https://github.com/geyserfund/geyser-app/commit/8ff7b61331c93a8470d06cb8150d611b81f93c6c))
+* fix styles in funding comment box ([#882](https://github.com/geyserfund/geyser-app/issues/882)) ([40ab4b5](https://github.com/geyserfund/geyser-app/commit/40ab4b599602d9d3c80055e6134bdda3c762a037))
+* funding flow success for on-chain funding ([e0c31a8](https://github.com/geyserfund/geyser-app/commit/e0c31a8603cf93f28a502c71aff6e99d848fbd78))
+* handle conflict ([d35bd7a](https://github.com/geyserfund/geyser-app/commit/d35bd7af8eb38dd48c18334c09ae815f2dc305b9))
+* hotfix for search ([891b0b4](https://github.com/geyserfund/geyser-app/commit/891b0b4690ebc875bd049cd2cf54e75e52c77712))
+* increase spacing ([cce108d](https://github.com/geyserfund/geyser-app/commit/cce108d0364ae712e135d23a90ce1bc9242f0112))
+* pass in date time value ([0ded6d7](https://github.com/geyserfund/geyser-app/commit/0ded6d753e98cb3b09ac9f48b1bfc6b60021e9e5))
+* profile page ([2c9b570](https://github.com/geyserfund/geyser-app/commit/2c9b570de050848584ed8d73dd8b0ed755070e15))
+* project navigation styles ([5d76361](https://github.com/geyserfund/geyser-app/commit/5d7636182323a33d75d3bbfbbf17278964159e3c))
+* remove featured grant ([5128001](https://github.com/geyserfund/geyser-app/commit/51280016550acb39c306830c3b3ecbace3efd662))
+* revert deepscan change ([#840](https://github.com/geyserfund/geyser-app/issues/840)) ([#841](https://github.com/geyserfund/geyser-app/issues/841)) ([6b8da55](https://github.com/geyserfund/geyser-app/commit/6b8da55c8b79c7dbfb263bbf6e7e21e9c7e1403c))
+* support for no good lightning email address ([187107c](https://github.com/geyserfund/geyser-app/commit/187107ca3540860b2c3baf0cac0b7aefba949b87))
+* update featured project to miprimerbitcoinbiggestgraduationinmay ([f95d0af](https://github.com/geyserfund/geyser-app/commit/f95d0afb0af9e83ad4a0732970b30f7d29ce966b))
+* update hot-jar id ([c36d07b](https://github.com/geyserfund/geyser-app/commit/c36d07b89a9955f1f8f040ca107254c8bcbca4e0))
+* update recent projects to see recent ([7039218](https://github.com/geyserfund/geyser-app/commit/7039218752a96b5adea688516c3ae6c0846897fb))
+* use default value as fundingTx paidAt if date is not provided ([a42d29d](https://github.com/geyserfund/geyser-app/commit/a42d29d9475b67bf0e5b776256afc1a8fe6a5d76))
+* validations to parse before checking values ([a86f369](https://github.com/geyserfund/geyser-app/commit/a86f3695432e7e3f13461e9489209ee93ca97f4d))
+* word-wrap in community voting widget ([cb668a7](https://github.com/geyserfund/geyser-app/commit/cb668a72ff8766f745fe501bf31450f9551490cd))
+
+
+### Reverts
+
+* Revert "Revert "PRODUCTION PUSH"" ([f349517](https://github.com/geyserfund/geyser-app/commit/f3495175717cef8daf91b9e2087eaabe031e3174))
+
 ## 0.1.0 (2023-05-05)
 
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "geyser-app",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.1.1",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

diff --git a/src/components/molecules/projectDisplay/RewardCard.tsx b/src/components/molecules/projectDisplay/RewardCard.tsx
@@ -59,7 +59,12 @@ export const RewardCard = ({
                   {`$ ${reward.cost / 100}`}
                 </Text>
               )}
-              <Text fontSize="12px" color={colors.textBlack} fontWeight="bold">
+              <Text
+                whiteSpace="nowrap"
+                fontSize="12px"
+                color={colors.textBlack}
+                fontWeight="bold"
+              >
                 per item
               </Text>
             </VStack>

diff --git a/src/constants/platform/defaultViewTags.ts b/src/constants/platform/defaultViewTags.ts
@@ -26,7 +26,7 @@ export const getFeaturedProject = () => {
   }
 
   if (__production__) {
-    return 'miprimerbitcoinbiggestgraduationinmay'
+    return 'heroofbitcoin'
   }
 
   return ''

diff --git a/src/constants/platform/noFeeProjects.ts b/src/constants/platform/noFeeProjects.ts
@@ -1,15 +1,11 @@
 export const noFeeProjects = [
   'ayudaalosjvenesalfuturo',
   'bff',
-  // 'anonymal',
-  // 'chesskingdoms',
   'bloggingbitcoingeyser',
   'blip',
   'bwbip47',
   'amityageacademy',
   'lahoracripto',
-  // 'designerclothingstorebitcoin',
-  // 'blixt',
   'alphabettingthefirsthedgefundbasedonfantokens',
   'africanwomenattendingafricabitcoinconference',
   'jvenesenaccinlimpiezaenlacomunidad',
@@ -23,14 +19,8 @@ export const noFeeProjects = [
   'nodeyez',
   'creeksidesummercamp',
   'thecryptoc0up1e',
-  // 'greekbitcoinworkshop',
   'sovereignrancher',
   'nobsbitcoin',
-  'bitcointradingcards',
-  // 'dirtycointhecontroversy',
-  // 'behindbitcoinmining',
-  // 'bitcoinkids',
-  // 'bitcoinballersacademy',
   'latinodos',
   'btcmap',
   'bitcoinacademy',
@@ -40,8 +30,6 @@ export const noFeeProjects = [
   'homelesswarmwear',
   'proofofresilience',
   'bitcoin60seconds',
-  // 'ionio',
-  // 'anewgoatproject',
   'geyser',
   'thelastrevolution',
   'betweentwoasics',

diff --git a/src/pages/landing/projects/views/DefaultView.tsx b/src/pages/landing/projects/views/DefaultView.tsx
@@ -1,17 +1,20 @@
 import { useMemo } from 'react'
 
 import { CardLayout } from '../../../../components/layouts'
-import { getListOfTags } from '../../../../constants'
-import { useGrants } from '../../../grants/hooks/useGrants'
+import { getFeaturedProject, getListOfTags } from '../../../../constants'
+// import { useGrants } from '../../../grants/hooks/useGrants'
 import {
   ProjectsDisplay,
   ProjectsDisplayMostFundedThisWeek,
 } from '../components'
 // import { FeaturedProjectCard } from '../elements'
-import { FeaturedGrantCard } from '../elements'
+import {
+  //  FeaturedGrantCard,
+  FeaturedProjectCard,
+} from '../elements'
 
 export const DefaultView = () => {
-  const { activeGrant, loading } = useGrants()
+  // const { activeGrant, loading } = useGrants()
 
   const allTags = useMemo(() => getListOfTags(), [])
 
@@ -20,8 +23,8 @@ export const DefaultView = () => {
 
   return (
     <CardLayout w="full" spacing="50px" padding="20px">
-      {/* <FeaturedProjectCard projectName={getFeaturedProject()} /> */}
-      <FeaturedGrantCard grant={activeGrant} loading={loading} />
+      <FeaturedProjectCard projectName={getFeaturedProject()} />
+      {/* <FeaturedGrantCard grant={activeGrant} loading={loading} /> */}
       {firstThreeTags.map((tag) => {
         return <ProjectsDisplayMostFundedThisWeek key={tag.id} tag={tag} />
       })}

diff --git a/src/pages/projectCreate/ProjectCreate.tsx b/src/pages/projectCreate/ProjectCreate.tsx
@@ -136,9 +136,8 @@ export const ProjectCreate = () => {
 
   const handleNextButtonTapped = () => {
     const isValid = validateForm()
-
-    if (data?.project && isValid) {
-      if (isEditingExistingProject) {
+    if (isValid) {
+      if (isEditingExistingProject && data?.project) {
         updateProject({
           variables: {
             input: {

diff --git a/src/pages/projectView/projectActivityPanel/screens/ProjectFundingQRScreen.tsx b/src/pages/projectView/projectActivityPanel/screens/ProjectFundingQRScreen.tsx
@@ -4,7 +4,7 @@ import { useEffect } from 'react'
 import { FaTelegramPlane } from 'react-icons/fa'
 
 import { SectionTitle } from '../../../../components/ui'
-import { GeyserTelegramUrl } from '../../../../constants'
+import { fundingStages, GeyserTelegramUrl } from '../../../../constants'
 import { useFundCalc } from '../../../../helpers/fundingCalculation'
 import { IFundForm, UseFundingFlowReturn } from '../../../../hooks'
 import {
@@ -42,7 +42,11 @@ export const ProjectFundingQRScreen = ({
   useEffect(() => {
     // Cancel invoice on the backend after QR section unmounts
     return () => {
-      if (fundingFlow.fundingTx.invoiceId) {
+      if (
+        fundingFlow.fundState !== fundingStages.started &&
+        fundingFlow.fundState !== fundingStages.canceled &&
+        fundingFlow.fundingTx.invoiceId
+      ) {
         cancelInvoice({
           variables: { invoiceId: fundingFlow.fundingTx.invoiceId },
         })

diff --git a/src/pages/projectView/projectMainBody/components/ProjectFundingFormCommentField.tsx b/src/pages/projectView/projectMainBody/components/ProjectFundingFormCommentField.tsx
@@ -46,7 +46,7 @@ export const ProjectFundingFormCommentField = ({
   ...rest
 }: Props) => {
   const isMobile = useMobileMode()
-
+  const { isAnonymous, loginOnOpen, user } = useAuthContext()
   const textAreaRef = useRef<HTMLTextAreaElement>(null)
 
   const {
@@ -73,8 +73,6 @@ export const ProjectFundingFormCommentField = ({
     [gifSearch],
   )
 
-  const { isAnonymous, loginOnOpen, user } = useAuthContext()
-
   return (
     <Box {...rest}>
       <HStack width="100%" position="relative">
@@ -90,7 +88,9 @@ export const ProjectFundingFormCommentField = ({
             name="comment"
             pl={10}
             borderWidth="2px"
-            borderColor="brand.primary500"
+            _active={{
+              borderColor: 'primary.500',
+            }}
             backgroundColor={'brand.bgWhite'}
             onChange={setTarget}
           />
@@ -109,14 +109,15 @@ export const ProjectFundingFormCommentField = ({
               label="Funding annonymously. Click to login"
             >
               <AvatarElement
+                borderRadius="50%"
                 cursor="pointer"
                 noLink
                 onClick={loginOnOpen}
                 avatarOnly
               />
             </Tooltip>
           ) : (
-            <AvatarElement user={user} avatarOnly />
+            <AvatarElement borderRadius="50%" user={user} avatarOnly />
           )}
         </Box>
 

diff --git a/src/pages/projectView/projectMainBody/sections/Rewards.tsx b/src/pages/projectView/projectMainBody/sections/Rewards.tsx
@@ -137,16 +137,18 @@ export const Rewards = forwardRef<HTMLDivElement, Props>(
           return (
             <HStack
               key={reward.id}
-              height="100%"
-              spacing="20px"
+              pb={6}
+              px={2}
+              alignSelf="stretch"
               alignItems="stretch"
+              justifySelf="stretch"
               justifyContent="stretch"
+              maxWidth="350px"
+              flexWrap="wrap"
             >
               <RewardCard
-                maxWidth="350px"
                 key={reward.id}
                 width="100%"
-                mx={2}
                 reward={reward}
                 isSatoshi={false}
                 handleEdit={
@@ -200,7 +202,7 @@ export const Rewards = forwardRef<HTMLDivElement, Props>(
         >
           <ProjectSectionBar name={'Rewards'} number={rewardsLength} />
 
-          <HStack width="100%" justifyContent="center">
+          <HStack width="100%" flexWrap="wrap" justifyContent="center">
             {renderRewards()}
           </HStack>
         </CardLayout>

diff --git a/src/pages/projectView/projectNavigation/components/ProjectNavigation.tsx b/src/pages/projectView/projectNavigation/components/ProjectNavigation.tsx
@@ -18,47 +18,50 @@ export const ProjectNavigation = ({
   onRewardsClick,
   onMilestonesClick,
 }: UseProjectAnchors) => {
+  const hasItems = Boolean(entriesLength || rewardsLength || milestonesLength)
   return (
     <VStack ml={4} pt={5} pb={2}>
       <ProjectBackButton width="100%" />
-      <CardLayout>
-        <VStack maxWidth="100%">
-          <ProjectNavigationButton
-            // isActive={inView === 'header'}
-            onClick={onProjectClick}
-            leftIcon={<ProjectIcon />}
-          >
-            Project
-          </ProjectNavigationButton>
-          {Boolean(entriesLength) && (
+      {hasItems ? (
+        <CardLayout padding={2}>
+          <VStack maxWidth="100%">
             <ProjectNavigationButton
-              // isActive={inView === 'entries'}
-              onClick={onEntriesClick}
-              leftIcon={<EntryEditIcon />}
+              // isActive={inView === 'header'}
+              onClick={onProjectClick}
+              leftIcon={<ProjectIcon />}
             >
-              Entries
+              Project
             </ProjectNavigationButton>
-          )}
-          {Boolean(rewardsLength) && (
-            <ProjectNavigationButton
-              // isActive={inView === 'rewards'}
-              onClick={onRewardsClick}
-              leftIcon={<RewardGiftIcon />}
-            >
-              Rewards
-            </ProjectNavigationButton>
-          )}
-          {Boolean(milestonesLength) && (
-            <ProjectNavigationButton
-              // isActive={inView === 'milestones'}
-              onClick={onMilestonesClick}
-              leftIcon={<MilestoneIcon />}
-            >
-              Milestones
-            </ProjectNavigationButton>
-          )}
-        </VStack>
-      </CardLayout>
+            {Boolean(entriesLength) && (
+              <ProjectNavigationButton
+                // isActive={inView === 'entries'}
+                onClick={onEntriesClick}
+                leftIcon={<EntryEditIcon />}
+              >
+                Entries
+              </ProjectNavigationButton>
+            )}
+            {Boolean(rewardsLength) && (
+              <ProjectNavigationButton
+                // isActive={inView === 'rewards'}
+                onClick={onRewardsClick}
+                leftIcon={<RewardGiftIcon />}
+              >
+                Rewards
+              </ProjectNavigationButton>
+            )}
+            {Boolean(milestonesLength) && (
+              <ProjectNavigationButton
+                // isActive={inView === 'milestones'}
+                onClick={onMilestonesClick}
+                leftIcon={<MilestoneIcon />}
+              >
+                Milestones
+              </ProjectNavigationButton>
+            )}
+          </VStack>
+        </CardLayout>
+      ) : null}
     </VStack>
   )
 }

diff --git a/src/utils/info/useMobileMode.ts b/src/utils/info/useMobileMode.ts
@@ -15,5 +15,9 @@ export const useMobileMode = (
 ) => {
   const [isMobile] = useMediaQuery(`(max-width: ${props.mobileBreakpoint}px)`)
 
+  if (isMobile === undefined) {
+    return true
+  }
+
   return isMobile
 }