Skip to content

Commit e2aa3d5

Browse files
committed
Chore: post-rebase fixes
1 parent 6e010e0 commit e2aa3d5

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

src/components/common/ColonyActions/helpers/getActionTitleValues.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,26 @@ export enum ActionTitleMessageKeys {
4343
}
4444

4545
/* Maps actionTypes to message values as found in en-actions.ts */
46+
/**
47+
* @TODO: Refactor to use comparison instead of includes which is just a partial match on the string
48+
*/
4649
const getMessageDescriptorKeys = (actionType: AnyActionType) => {
4750
switch (true) {
48-
case actionType.includes(ColonyActionType.Payment) &&
49-
!actionType.includes(ExtendedColonyActionType.SplitPayment):
51+
case actionType.includes(ColonyActionType.CreateStreamingPayment):
5052
return [
5153
ActionTitleMessageKeys.Recipient,
5254
ActionTitleMessageKeys.Amount,
5355
ActionTitleMessageKeys.TokenSymbol,
5456
ActionTitleMessageKeys.Initiator,
57+
ActionTitleMessageKeys.Period,
5558
];
56-
case actionType.includes(ColonyActionType.CreateStreamingPayment):
59+
case actionType.includes(ColonyActionType.Payment) &&
60+
!actionType.includes(ExtendedColonyActionType.SplitPayment):
5761
return [
5862
ActionTitleMessageKeys.Recipient,
5963
ActionTitleMessageKeys.Amount,
6064
ActionTitleMessageKeys.TokenSymbol,
6165
ActionTitleMessageKeys.Initiator,
62-
ActionTitleMessageKeys.Period,
6366
];
6467
case actionType.includes(ColonyActionType.MoveFunds):
6568
return [

src/components/v5/common/ActionSidebar/partials/forms/StreamingPaymentForm/StreamingPaymentForm.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ const StreamingPaymentForm: FC<ActionFormBaseProps> = ({ getFormOptions }) => {
112112
<AmountField
113113
name="limit"
114114
tokenAddressFieldName="limitTokenAddress"
115-
maxWidth={270}
116115
domainId={selectedTeam}
117116
isDisabled={hasNoDecisionMethods}
118117
isTokenSelectionDisabled

src/components/v5/common/CompletedAction/partials/StreamingPayment/StreamingPayment.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const StreamingPayment: FC<StreamingPaymentProps> = ({
120120
address: user?.walletAddress || '',
121121
colony,
122122
requiredRoles: [ColonyRole.Arbitration],
123-
requiredRolesDomains: [streamingPaymentData.nativeDomainId],
123+
requiredRolesDomain: streamingPaymentData.nativeDomainId,
124124
});
125125

126126
// @todo: update cancel-related logic in separate PR
@@ -279,7 +279,7 @@ const StreamingPayment: FC<StreamingPaymentProps> = ({
279279
RowIcon={HandPalm}
280280
/>
281281
)}
282-
<DecisionMethodRow isMotion={action.isMotion || false} />
282+
<DecisionMethodRow action={action} />
283283

284284
{action.motionData?.motionDomain.metadata && (
285285
<CreatedInRow

src/constants/extensions.ts

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ExtensionLazyConsensusIcon from '~icons/ExtensionLazyConsensusIcon.tsx';
77
import ExtensionMultiSigIcon from '~icons/ExtensionMultiSigIcon.tsx';
88
import ExtensionOneTransactionPaymentIcon from '~icons/ExtensionOneTransactionPaymentIcon.tsx';
99
import ExtensionStagedPaymentsIcon from '~icons/ExtensionStagedPaymentsIcon.tsx';
10+
import ExtensionStreamingPaymentsIcon from '~icons/ExtensionStreamingPaymentsIcon.tsx';
1011
import multiSigHero from '~images/assets/extensions/multi-sig-hero.png';
1112
import multiSigInterface from '~images/assets/extensions/multi-sig-interface.png';
1213
import oneTransactionHero from '~images/assets/extensions/one-transaction-hero.png';
@@ -17,6 +18,8 @@ import stagedHero from '~images/assets/extensions/staged-hero.png';
1718
import stagedInterface from '~images/assets/extensions/staged-interface.png';
1819
import stakedHero from '~images/assets/extensions/staked-hero.png';
1920
import stakedInterface from '~images/assets/extensions/staked-interface.png';
21+
import streamingHero from '~images/assets/extensions/streaming-hero.png';
22+
import streamingInterface from '~images/assets/extensions/streaming-interface.png';
2023
import { type ExtensionConfig } from '~types/extensions.ts';
2124
import {
2225
convertFractionToWei,
@@ -378,18 +381,23 @@ export const supportedExtensionsConfig: ExtensionConfig[] = [
378381
uninstallable: true,
379382
createdAt: 1692048380000,
380383
},
381-
// {
382-
// icon: ExtensionAdvancedPaymentsIcon,
383-
// imageURLs: [streamingHero, streamingInterface],
384-
// category: ExtensionCategory.Expenditures,
385-
// extensionId: Extension.StreamingPayments,
386-
// name: MSG.streamingPaymentsName,
387-
// descriptionShort: MSG.streamingPaymentsDescriptionShort,
388-
// descriptionLong: MSG.streamingPaymentsDescriptionLong,
389-
// neededColonyPermissions: [ColonyRole.Administration, ColonyRole.Funding],
390-
// uninstallable: true,
391-
// createdAt: 1692048380000,
392-
// },
384+
{
385+
icon: ExtensionStreamingPaymentsIcon,
386+
imageURLs: [streamingHero, streamingInterface],
387+
category: ExtensionCategory.Expenditures,
388+
extensionId: Extension.StreamingPayments,
389+
name: MSG.streamingPaymentsName,
390+
descriptionShort: MSG.streamingPaymentsDescriptionShort,
391+
descriptionLong: MSG.streamingPaymentsDescriptionLong,
392+
neededColonyPermissions: [
393+
ColonyRole.Administration,
394+
ColonyRole.Funding,
395+
ColonyRole.Arbitration,
396+
],
397+
uninstallable: true,
398+
createdAt: 1692048380000,
399+
autoEnableAfterInstall: true,
400+
},
393401
{
394402
icon: ExtensionMultiSigIcon,
395403
imageURLs: [multiSigHero, multiSigInterface],

0 commit comments

Comments
 (0)