Merge pull request #163 from MinaFoundation/bug/merge-conflit

bug: resolve conflict
MinaFoundation · Feb 18, 2025 · 3770109 · 3770109
2 parents d74ae84 + 69d74d2
commit 3770109
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 98 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pgt-web-app",
-	"version": "0.1.58",
+	"version": "0.1.59",
 	"private": true,
 	"type": "module",
 	"scripts": {

diff --git a/src/components/CreateEditFundingRound.tsx b/src/components/CreateEditFundingRound.tsx
@@ -443,102 +443,6 @@ export function AddEditFundingRoundComponent({
 					</h1>
 				</div>
 
-<<<<<<< HEAD
-  return (
-    <div key={phase.key} className="grid gap-4">
-      <Label>{phase.label}</Label>
-      <div className="grid grid-cols-2 gap-4">
-        <div className="space-y-2">
-          <Label>From</Label>
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button
-                variant="outline"
-                className={cn(
-                  "w-full justify-start text-left font-normal bg-muted",
-                  !dates.from && "text-muted-foreground"
-                )}
-              >
-                {dates.from ? (
-                  formatUTC(dates.from)
-                ) : (
-                  <span>Pick a date</span>
-                )}
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-auto p-0" align="start">
-            <Calendar
-  mode="single"
-  selected={dates.from || undefined}  // Convert null to undefined
-  onSelect={(date) => handleDateChange(phase.key, 'from', date || null)}  // Handle undefined
-  disabled={loading}
-                initialFocus
-              />
-              <div className="p-3 border-t">
-                <Input
-                  type="time"
-                  onChange={(e) => {
-                    if (dates.from) {
-                      const [hours, minutes] = e.target.value.split(':');
-                      const newDate = new Date(dates.from);
-                      newDate.setUTCHours(parseInt(hours), parseInt(minutes));
-                      handleDateChange(phase.key, 'from', newDate);
-                    }
-                  }}
-                  disabled={loading}
-                />
-              </div>
-            </PopoverContent>
-          </Popover>
-        </div>
-        <div className="space-y-2">
-          <Label>To</Label>
-          <Popover>
-            <PopoverTrigger asChild>
-              <Button
-                variant="outline"
-                className={cn(
-                  "w-full justify-start text-left font-normal bg-muted",
-                  !dates.to && "text-muted-foreground"
-                )}
-              >
-                {dates.to ? (
-                  formatUTC(dates.to)
-                ) : (
-                  <span>Pick a date</span>
-                )}
-              </Button>
-            </PopoverTrigger>
-            <PopoverContent className="w-auto p-0" align="start">
-            <Calendar
-  mode="single"
-  selected={dates.to || undefined}  // Convert null to undefined
-  onSelect={(date) => handleDateChange(phase.key, 'to', date || null)}  // Handle undefined
-  disabled={loading}
-  initialFocus
-/>
-              <div className="p-3 border-t">
-                <Input
-                  type="time"
-                  onChange={(e) => {
-                    if (dates.to) {
-                      const [hours, minutes] = e.target.value.split(':');
-                      const newDate = new Date(dates.to);
-                      newDate.setUTCHours(parseInt(hours), parseInt(minutes));
-                      handleDateChange(phase.key, 'to', newDate);
-                    }
-                  }}
-                  disabled={loading}
-                />
-              </div>
-            </PopoverContent>
-          </Popover>
-        </div>
-      </div>
-    </div>
-              );
-            })}
-=======
 				<form onSubmit={e => e.preventDefault()} className="space-y-6">
 					{/* Basic Information */}
 					<div className="space-y-4">
@@ -553,7 +457,6 @@ export function AddEditFundingRoundComponent({
 							disabled={loading}
 						/>
 					</div>
->>>>>>> main
 
 					<div className="space-y-4">
 						<Label htmlFor="description">Description</Label>