Skip to content

Commit

Permalink
Merge pull request #2450 from JoinColony/fix/2314-verify-all-addresses
Browse files Browse the repository at this point in the history
fix: Add addresses to a Colony even if they are not members
  • Loading branch information
rumzledz authored Jun 7, 2024
2 parents 184a546 + 2235b6d commit fd7dd93
Show file tree
Hide file tree
Showing 41 changed files with 101 additions and 1,121 deletions.
32 changes: 0 additions & 32 deletions .storybook/data/colonyContext.ts

Large diffs are not rendered by default.

39 changes: 2 additions & 37 deletions amplify/backend/api/colonycdapp/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -849,17 +849,10 @@ type Mutation {
): Boolean @function(name: "updateContributorsWithReputation-${env}")

"""
Validates the user invite code and adds the user to the colony whitelist
and as a colony contributor
Validates the user invite code and adds the user as a colony contributor
"""
validateUserInvite(input: ValidateUserInviteInput!): Boolean
@function(name: "validateUserInvite-${env}")
"""
Removes the user from the colony whitelist
"""
removeMemberFromColonyWhitelist(
input: RemoveMemberFromColonyWhitelistInput!
): Boolean @function(name: "removeMemberFromColonyWhitelist-${env}")
}

"""
Expand Down Expand Up @@ -1136,7 +1129,7 @@ type ColonyContributor @model @searchable {
type: ContributorType

"""
Is the contributor a member of the colony's whitelist?
Is the contributor a verified member of the colony?
"""
isVerified: Boolean!

Expand Down Expand Up @@ -1311,11 +1304,6 @@ type Colony @model {
"""
colonyMemberInvite: ColonyMemberInvite
@hasOne(fields: ["colonyMemberInviteCode"])

"""
An array of all whitelisted wallet addresses
"""
whitelist: [ID!]!
}

input ValidateUserInviteInput {
Expand All @@ -1333,17 +1321,6 @@ input ValidateUserInviteInput {
userAddress: ID!
}

input RemoveMemberFromColonyWhitelistInput {
"""
The colony address
"""
colonyAddress: ID!
"""
The user's wallet address
"""
userAddress: ID!
}

type ColonyMemberInvite @model {
"""
Self-managed id which is used as the invite code
Expand Down Expand Up @@ -1466,14 +1443,6 @@ type ColonyMetadata @model {
"""
changelog: [ColonyMetadataChangelog!]
"""
The address book feature (aka Whitelist is active for this Colony)
"""
isWhitelistActivated: Boolean
"""
List of addresses that are in the address book
"""
whitelistedAddresses: [String!]
"""
Token addresses that were modified in a previous action (motion)
Only present on pendingColonyMetadata for consumption in block ingestor
"""
Expand Down Expand Up @@ -1514,10 +1483,6 @@ type ColonyMetadataChangelog {
"""
hasAvatarChanged: Boolean!
"""
Whether entries in the address book (whitelist) have changed
"""
hasWhitelistChanged: Boolean!
"""
Whether tokens have been added or removed from the Colony's token list
"""
haveTokensChanged: Boolean!
Expand Down
14 changes: 0 additions & 14 deletions amplify/backend/backend-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,20 +204,6 @@
"providerPlugin": "awscloudformation",
"service": "Lambda"
},
"removeMemberFromColonyWhitelist": {
"build": true,
"dependsOn": [
{
"attributes": [
"Arn"
],
"category": "function",
"resourceName": "colonycdappSSMAccess"
}
],
"providerPlugin": "awscloudformation",
"service": "Lambda"
},
"updateContributorsWithReputation": {
"build": true,
"dependsOn": [
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit fd7dd93

Please sign in to comment.