Skip to content

Commit 22da6f7

Browse files
committed
Merge branch 'update/v0.5.0'
2 parents d0047dd + 8b06b1a commit 22da6f7

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

DEVELOPERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ First, build the webhapp if you haven't done so yet:
4343

4444
This will create an `[acorn-desktop.webhapp](./happs/happ/workdir/acorn-desktop.webhapp)` file. Upload this to the [Acorn release page](https://github.com/lightningrodlabs/acorn/releases) with the appropriate version tag.
4545

46-
Then, clone the `[acorn-desktop](https://github.com/lightningrodlabs/acorn-desktop/tree/v11.1.2)` repo. Take the `acorn-desktop.webhapp` file and copy it into the `/pouch` directory. Follow the rest of the instruction in the README. This should trigger a github action which automatically builds and releases multi-platform versions of Acorn, signed and ready to download on the [release page](https://github.com/lightningrodlabs/acorn-desktop/releases)
46+
Then, clone the `[acorn-desktop](https://github.com/lightningrodlabs/acorn-desktop/tree/v11.1.2)` repo. Trigger a release by following the instructions in the README. This should trigger a github action which automatically fetches the webhapp from the previous step and builds and releases multi-platform versions of Acorn, signed and ready to download on the [release page](https://github.com/lightningrodlabs/acorn-desktop/releases).
4747

4848
### Building / Packaging Moss Tool
4949

web/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ const EvDetails: React.FC<EvDetailsProps> = ({
123123
endDescriptionEdit,
124124
editingPeers,
125125
// Destructure rightColumn prop
126-
rightColumn,
127126
}) => {
128127
// reset
129128
useEffect(() => {
@@ -488,7 +487,6 @@ const EvDetails: React.FC<EvDetailsProps> = ({
488487
{/* End of ev-details-main-content */}
489488

490489
{/* Render the right column alongside the main content */}
491-
{rightColumn}
492490
</div>
493491
)
494492
}

web/src/components/ExpandedViewMode/ExpandedViewMode.connector.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
357357
renderAsModal={renderAsModal}
358358
// Other props (may not be directly used by component but needed by connector logic/passed down)
359359
updateOutcome={updateOutcome} // Passed down
360-
activeAgentPubKey={activeAgentPubKey} // Passed down (though might not be needed directly in component)
361360
/>
362361
)
363362
}

web/src/weave/OutcomeAssetView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ const OutcomeAssetView: React.FC<OutcomeAssetViewProps> = ({ wal }) => {
188188
onClose={() => {}}
189189
outcome={expandedViewOutcome} // Pass the computed outcome
190190
outcomeAndAncestors={expandedViewOutcomeAndAncestors} // Pass ancestors
191+
//@ts-ignore
191192
updateOutcome={updateOutcomeCallback} // Pass callback
192193
// createOutcomeWithConnection is handled by the connector if needed
193194
renderAsModal={false} // Explicitly render without modal chrome

0 commit comments

Comments
 (0)