Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
e1453b5
Feat: Cancel streams using permissions
iamsamgibbs May 3, 2024
97d190d
Merge pull request #2321 from JoinColony/feat/2215-cancel-streams-usi…
iamsamgibbs May 9, 2024
01a7b32
Create claim streaming payment saga
davecreaser May 3, 2024
1934626
Add streaming payment claims
davecreaser May 7, 2024
56e539e
Add timestamp to streaming payment claims and code cleanup
davecreaser May 8, 2024
70c70db
Schema update: adjust streaming payment model for a single token
jakubcolony Jun 6, 2024
aa79d90
Schema update: remove token address from StreamingPaymentClaim
jakubcolony Jun 6, 2024
d130443
feat: add a ColonyActionType enum entry for cancel and waive
rumzledz Jun 11, 2024
1396c8d
Set correct end time for streaming payments based on end condition
davecreaser Jun 14, 2024
461976b
feat: fix permission proof for StreamingPayment cancel
rumzledz Jun 12, 2024
52b6103
Feat: Edit streams using permissions
iamsamgibbs May 8, 2024
8d27a6e
Feat: Remove limit amount from streamingPaymentMetadata
iamsamgibbs Jul 10, 2024
987f61c
Fix: Adjust getEndTimeByEndCondition and getStreamingPaymentLimit to …
iamsamgibbs Jul 11, 2024
08c7277
Feat: Edit streams using motions
iamsamgibbs Jul 18, 2024
9aefca5
Feat: Add changelog to streaming payment and streaming payment metadata
iamsamgibbs Jul 22, 2024
e9d3a48
Fix: Store streaming payment changes on colony action, and tidy up ed…
iamsamgibbs Jul 23, 2024
6d9210a
Chore: update generated and block-ingestor hash post-rebase
jakubcolony Nov 6, 2024
370c028
Schema update: Add creatorAddress to StreamingPayment, make it @searc…
jakubcolony Oct 4, 2024
35dcf02
feat: streaming payments extension page
joanna-pagepro Jul 17, 2024
bc50135
feat: datepicker with time
joanna-pagepro Jul 24, 2024
d7e40c4
feat: streaming payment form
joanna-pagepro Aug 12, 2024
68ec318
Fix: C2F address adjustment in createStreamingPayment saga
jakubcolony Sep 17, 2024
316564d
Feat: Set action title when creating streaming payment
jakubcolony Sep 17, 2024
be4db0b
feat: streaming payment preview base
joanna-pagepro Aug 30, 2024
2521f32
feat: user hub updated with streams
joanna-pagepro Sep 3, 2024
b5ccf4e
Chore: post-rebase fixes
jakubcolony Oct 1, 2024
cffc74b
feat: add streaming payments subpage
Oct 4, 2024
92fd5d4
fixes after rebase
CzarekDryl Nov 7, 2024
d76ee3c
fixes after rebase
CzarekDryl Nov 7, 2024
4efeb32
fix: use streamingPaymentId
CzarekDryl Nov 15, 2024
b4a3d18
fix: remove validation for streaming payments when enter too big amount
Nov 12, 2024
ae6fade
fix: console error
Nov 12, 2024
07d17c2
feat: streaming payment redo
CzarekDryl Nov 7, 2024
9d5c71c
fix: use new id
CzarekDryl Nov 7, 2024
9db05f0
fix: add transform to dep array
CzarekDryl Nov 12, 2024
f2462f5
fix: remove clg
CzarekDryl Nov 14, 2024
771d069
Feat: Cancel streams using permissions
iamsamgibbs May 3, 2024
a798630
Create claim streaming payment saga
davecreaser May 3, 2024
b6f8680
Add streaming payment claims
davecreaser May 7, 2024
71242bf
Add timestamp to streaming payment claims and code cleanup
davecreaser May 8, 2024
1d1de6d
Schema update: adjust streaming payment model for a single token
jakubcolony Jun 6, 2024
d24df6b
Schema update: remove token address from StreamingPaymentClaim
jakubcolony Jun 6, 2024
25a4415
feat: add a ColonyActionType enum entry for cancel and waive
rumzledz Jun 11, 2024
6a568d3
Set correct end time for streaming payments based on end condition
davecreaser Jun 14, 2024
99a01dc
feat: fix permission proof for StreamingPayment cancel
rumzledz Jun 12, 2024
871a1e5
Feat: Edit streams using permissions
iamsamgibbs May 8, 2024
735890a
Feat: Remove limit amount from streamingPaymentMetadata
iamsamgibbs Jul 10, 2024
d73d01e
Fix: Adjust getEndTimeByEndCondition and getStreamingPaymentLimit to …
iamsamgibbs Jul 11, 2024
ef41c91
Feat: Edit streams using motions
iamsamgibbs Jul 18, 2024
eb88859
Feat: Add changelog to streaming payment and streaming payment metadata
iamsamgibbs Jul 22, 2024
93efdd2
Fix: Store streaming payment changes on colony action, and tidy up ed…
iamsamgibbs Jul 23, 2024
313b94f
Chore: update generated and block-ingestor hash post-rebase
jakubcolony Nov 6, 2024
6181739
feat: streaming payments extension page
joanna-pagepro Jul 17, 2024
ee22b69
Fix: C2F address adjustment in createStreamingPayment saga
jakubcolony Sep 17, 2024
e7e61d6
fix: use new id
CzarekDryl Nov 7, 2024
1772ef1
fix: remove clg
CzarekDryl Nov 14, 2024
077cd0e
fix: refresh available funds
CzarekDryl Dec 13, 2024
9d593c1
fix: dep array
CzarekDryl Dec 17, 2024
518580a
feat: add widgets for streaming payments page
Oct 11, 2024
d538639
fix: streaming payments code review improvements
Oct 24, 2024
0a3aa6b
fix: add corrections
Oct 28, 2024
f3ac42f
fix: calculate streams for last 30 days
Nov 6, 2024
b59ed5c
fix: fixes after rebase
Nov 7, 2024
d96adb5
fix: handle invalid date and parsing numbers
Nov 18, 2024
ccbb848
fix: display streamings for tablet
Nov 26, 2024
04cd68b
fix: change text for active streaming, handle size for tablet and cha…
adam-strzelec Dec 9, 2024
60f3e85
fix: calculate active streaming for active streaming payments
adam-strzelec Dec 9, 2024
87f6810
fix: calculate active streaming logic
adam-strzelec Dec 10, 2024
44560e5
fix: change name for calculate active streaming function
adam-strzelec Dec 10, 2024
96b9c12
fix: hide total active streams for tablet
adam-strzelec Dec 16, 2024
579df9d
fix: display cards for tablet
adam-strzelec Dec 31, 2024
96b4082
fix: display extension error for streaming payments
adam-strzelec Jan 10, 2025
701bd80
fix: refactor extensions link
adam-strzelec Jan 13, 2025
c03ebae
feat: add teams filtration for streaming payments page
adam-strzelec Jan 9, 2025
9e78d27
fix: create component for teams filter
adam-strzelec Jan 13, 2025
529e7f6
fix: remove additional content with teams filter
adam-strzelec Jan 13, 2025
cc7972e
fix: extensions order
adam-strzelec Jan 8, 2025
b04c7b4
fix: remove expenditures category from extensions
adam-strzelec Jan 10, 2025
8bd241a
fix: change copy for streaming payments description item
adam-strzelec Jan 13, 2025
4bc629f
fix: display streaming payment metadata for action and activity feed
adam-strzelec Jan 10, 2025
7d99926
fix: add streaming payments to navigation and to payments actions
adam-strzelec Jan 7, 2025
2fb4d82
fix: remove comment and chage route name for streaming payments
adam-strzelec Jan 8, 2025
4a9d244
fix: display streaming navigation item conditionally
adam-strzelec Jan 14, 2025
850e38a
fix: rebase fixes
adam-strzelec Jan 17, 2025
3c30754
feat: streaming payments extension page
joanna-pagepro Jul 17, 2024
adea225
fix: date picker select year and custom time style
adam-strzelec Jan 7, 2025
48c95e8
fix: background for selected calendar day
adam-strzelec Jan 13, 2025
a585126
fix: rebase
adam-strzelec Jan 21, 2025
b1a7378
fixes after rebase
CzarekDryl Jan 23, 2025
1964e40
feat: streaming payment preview base
joanna-pagepro Aug 30, 2024
179dc59
feat: user hub updated with streams
joanna-pagepro Sep 3, 2024
ddf5abf
feat: streaming payment redo
CzarekDryl Nov 7, 2024
77f1c7b
fix: use new id
CzarekDryl Nov 7, 2024
946e7c0
feat: cancel streaming payment
joanna-pagepro Oct 7, 2024
703f3a5
fix: rebase
Nov 26, 2024
9264fb9
fix: navigate to relevant action
adam-strzelec Jan 9, 2025
9e159f6
fix: rebase fixes
adam-strzelec Jan 20, 2025
3350e2f
fix: display streamed info for cancelled transaction
adam-strzelec Jan 20, 2025
b371820
fix: available to claim amount and add associated action id
adam-strzelec Jan 21, 2025
db245b4
Fix: Change getStreamingPaymentCreatingActionId to use creatingAction…
iamsamgibbs Jan 27, 2025
78ac6ea
fix: sidebar width
adam-strzelec Jan 28, 2025
fcbbfaa
fix: replace streaming payment id with expenditure id
adam-strzelec Jan 28, 2025
cdc1c16
Fix: Claimable amount calculations to match contracts arithmetic
jakubcolony Jan 31, 2025
eeae54d
feat: added streaming payments table
CzarekDryl Nov 25, 2024
c24ccad
fixes after rebase
CzarekDryl Jan 23, 2025
932f3fb
fix: add load more
CzarekDryl Jan 23, 2025
f72094a
fix: table styles
adam-strzelec Jan 29, 2025
bf54afc
fix: logic
adam-strzelec Jan 30, 2025
5cb8d10
fix: rebase fixes
adam-strzelec Jan 31, 2025
91c8a29
fix: actions filtration
adam-strzelec Feb 4, 2025
b620002
fix: tables alignment
adam-strzelec Feb 5, 2025
36e7c66
fix: display ether avatar
adam-strzelec Feb 6, 2025
3c50929
fix: change copy for checkbox
adam-strzelec Jan 23, 2025
0d3cdfa
feat: display no extension banner on streaming payments page
adam-strzelec Jan 15, 2025
8fab0f9
fix: refactor condition
adam-strzelec Jan 15, 2025
1e5970c
fix: add link from react router dom and improve typo
adam-strzelec Jan 17, 2025
eeb9922
fix: rebase fix
adam-strzelec Jan 20, 2025
5b23b36
fix: get installed extension info from hook
adam-strzelec Jan 20, 2025
c68c4ff
fix: display banner when deprecated and disable button
adam-strzelec Feb 6, 2025
ee0c7da
fix: rebase fixes
adam-strzelec Feb 7, 2025
4dd65af
fix: schema
adam-strzelec Feb 7, 2025
c2e5d7b
fix: rebase
adam-strzelec Feb 7, 2025
4b1ca1e
fix: translations, meat ball menu position and action sidebar width
adam-strzelec Feb 10, 2025
ea51c5d
fix: types
adam-strzelec Feb 10, 2025
f989977
fix: rebase fixes
adam-strzelec Feb 11, 2025
5ad5924
fix: advanced payment status
adam-strzelec Feb 20, 2025
4c63841
Merge pull request #4265 from JoinColony/fix/16282688-advanced-paymen…
adam-strzelec Mar 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amplify/backend/api/colonycdapp/schema/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4324,4 +4324,4 @@ type UserStake @model {
Only applicable for expenditure stakes, indicates if the creator's stake was forfeited when expenditure was cancelled
"""
isForfeited: Boolean
}
}
258 changes: 0 additions & 258 deletions amplify/backend/backend-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -281,263 +281,5 @@
"providerPlugin": "awscloudformation",
"service": "Lambda"
}
},
"parameters": {
"AMPLIFY_function_colonycdappSSMAccess_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "colonycdappSSMAccess"
}
]
},
"AMPLIFY_function_colonycdappSSMAccess_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "colonycdappSSMAccess"
}
]
},
"AMPLIFY_function_createColonyEtherealMetadata_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "createColonyEtherealMetadata"
}
]
},
"AMPLIFY_function_createColonyEtherealMetadata_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "createColonyEtherealMetadata"
}
]
},
"AMPLIFY_function_createPrivateBetaInvite_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "createPrivateBetaInvite"
}
]
},
"AMPLIFY_function_createPrivateBetaInvite_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "createPrivateBetaInvite"
}
]
},
"AMPLIFY_function_createUniqueUser_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "createUniqueUser"
}
]
},
"AMPLIFY_function_createUniqueUser_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "createUniqueUser"
}
]
},
"AMPLIFY_function_fetchColonyBalances_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchColonyBalances"
}
]
},
"AMPLIFY_function_fetchColonyBalances_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchColonyBalances"
}
]
},
"AMPLIFY_function_fetchColonyNativeFundsClaim_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchColonyNativeFundsClaim"
}
]
},
"AMPLIFY_function_fetchColonyNativeFundsClaim_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchColonyNativeFundsClaim"
}
]
},
"AMPLIFY_function_fetchMotionState_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchMotionState"
}
]
},
"AMPLIFY_function_fetchMotionState_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchMotionState"
}
]
},
"AMPLIFY_function_fetchMotionTimeoutPeriods_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchMotionTimeoutPeriods"
}
]
},
"AMPLIFY_function_fetchMotionTimeoutPeriods_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchMotionTimeoutPeriods"
}
]
},
"AMPLIFY_function_fetchTokenFromChain_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchTokenFromChain"
}
]
},
"AMPLIFY_function_fetchTokenFromChain_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchTokenFromChain"
}
]
},
"AMPLIFY_function_fetchVoterRewards_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchVoterRewards"
}
]
},
"AMPLIFY_function_fetchVoterRewards_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "fetchVoterRewards"
}
]
},
"AMPLIFY_function_getSafeTransactionStatus_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "getSafeTransactionStatus"
}
]
},
"AMPLIFY_function_getSafeTransactionStatus_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "getSafeTransactionStatus"
}
]
},
"AMPLIFY_function_getUserReputation_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "getUserReputation"
}
]
},
"AMPLIFY_function_getUserReputation_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "getUserReputation"
}
]
},
"AMPLIFY_function_getUserTokenBalance_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "getUserTokenBalance"
}
]
},
"AMPLIFY_function_getUserTokenBalance_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "getUserTokenBalance"
}
]
},
"AMPLIFY_function_qaSSMtest_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "qaSSMtest"
}
]
},
"AMPLIFY_function_qaSSMtest_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "qaSSMtest"
}
]
},
"AMPLIFY_function_updateContributorsWithReputation_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "updateContributorsWithReputation"
}
]
},
"AMPLIFY_function_updateContributorsWithReputation_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "updateContributorsWithReputation"
}
]
},
"AMPLIFY_function_validateUserInvite_deploymentBucketName": {
"usedBy": [
{
"category": "function",
"resourceName": "validateUserInvite"
}
]
},
"AMPLIFY_function_validateUserInvite_s3Key": {
"usedBy": [
{
"category": "function",
"resourceName": "validateUserInvite"
}
]
}
}
}
23 changes: 23 additions & 0 deletions src/apollo/cache/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,29 @@ const cache = new InMemoryCache({
};
},
},
getStreamingPaymentsByColony: {
keyArgs: ['$domainId', '$recipientAddress'],
merge(existing = {}, incoming, { args }) {
// remove duplicates from incoming data
const uniqueIncomingItems = Array.from(
new Map(
// eslint-disable-next-line no-underscore-dangle
incoming.items.map((item) => [item.__ref, item]),
).values(),
);

if (!args?.nextToken) {
return {
...incoming,
items: uniqueIncomingItems,
};
}
return {
...incoming,
items: [...existing.items, ...uniqueIncomingItems],
};
},
},
},
},
...cacheUpdates,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
ColonyActionType,
type Colony,
type Expenditure,
type StreamingPayment,
} from '~types/graphql.ts';
import {
getExtendedActionType,
Expand Down Expand Up @@ -43,11 +44,38 @@ export enum ActionTitleMessageKeys {
StagedAmount = 'stagedAmount',
ArbitraryTransactionsLength = 'arbitraryTransactionsLength',
ArbitraryMethod = 'arbitraryMethod',
Period = 'period',
}

/* Maps actionTypes to message values as found in en-actions.ts */
/**
* @TODO: Refactor to use comparison instead of includes which is just a partial match on the string
*/
const getMessageDescriptorKeys = (actionType: AnyActionType) => {
switch (true) {
case actionType === ColonyActionType.Payment:
return [
ActionTitleMessageKeys.Recipient,
ActionTitleMessageKeys.Amount,
ActionTitleMessageKeys.TokenSymbol,
ActionTitleMessageKeys.Initiator,
];
case actionType.includes(ColonyActionType.CreateStreamingPayment):
return [
ActionTitleMessageKeys.Recipient,
ActionTitleMessageKeys.Amount,
ActionTitleMessageKeys.TokenSymbol,
ActionTitleMessageKeys.Initiator,
ActionTitleMessageKeys.Period,
];
case actionType.includes(ColonyActionType.Payment) &&
!actionType.includes(ExtendedColonyActionType.SplitPayment):
return [
ActionTitleMessageKeys.Recipient,
ActionTitleMessageKeys.Amount,
ActionTitleMessageKeys.TokenSymbol,
ActionTitleMessageKeys.Initiator,
];
case actionType.includes(ColonyActionType.MoveFunds):
return [
ActionTitleMessageKeys.Amount,
Expand Down Expand Up @@ -181,12 +209,14 @@ const useGetActionTitleValues = ({
keyFallbackValues,
expenditureData,
networkInverseFee,
streamingPaymentData,
}: {
actionData: ColonyAction | null | undefined;
colony: Pick<Colony, 'metadata' | 'nativeToken'> | undefined;
keyFallbackValues?: Partial<Record<ActionTitleMessageKeys, React.ReactNode>>;
expenditureData?: Expenditure;
networkInverseFee?: string;
streamingPaymentData?: StreamingPayment;
}) => {
const { isMotion, pendingColonyMetadata } = actionData || {};

Expand All @@ -196,6 +226,7 @@ const useGetActionTitleValues = ({
keyFallbackValues,
expenditureData,
networkInverseFee,
streamingPaymentData,
});

if (!actionData || !colony) {
Expand Down
Loading