Merge branch 'main' into proposal/register-fee-sharing

terra-money · Nov 15, 2023 · b9803b3 · b9803b3
2 parents e56e270 + d98fdbc
commit b9803b3
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 681 deletions.
diff --git a/apps/enterprise/package.json b/apps/enterprise/package.json
@@ -33,7 +33,7 @@
     "@hookform/resolvers": "^2.9.7",
     "@sentry/integrations": "^7.52.1",
     "@sentry/react": "^7.52.1",
-    "@terra-money/feather.js": "^1.0.8",
+    "@terra-money/feather.js": "^1.0.4",
     "@terra-money/log-finder-ruleset": "^3.0.2",
     "@terra-money/terra-station-mobile": "1.0.8",
     "@terra-money/wallet-kit": "1.0.11",

diff --git a/apps/enterprise/src/chain/CosmWasm.ts b/apps/enterprise/src/chain/CosmWasm.ts
@@ -66,11 +66,4 @@ export interface WasmMigrateMsg {
   }
 }
 
-export interface StargateMsg {
-  stargate: {
-    type_url: string,
-    value: string
-  }
-}
-
 export type CosmWasmMsg = BankSendMsg | DelegateMsg | UndelegateMsg | RedelegateMsg | WasmExecuteMsg | WasmInstantiateMsg | WasmMigrateMsg
diff --git a/apps/enterprise/src/dao/shared/proposal.ts b/apps/enterprise/src/dao/shared/proposal.ts
@@ -37,7 +37,6 @@ export const sharedProposalTypes = [
   'redelegate',
   'council',
   'minWeightForRewards',
-  'registerFeeShare',
 ] as const;
 
 export const daoProposalsRecord = {
@@ -69,7 +68,6 @@ export const proposalTitle: Record<ProposalType, string> = {
   redelegate: 'Redelegate LUNA',
   council: 'Update council',
   minWeightForRewards: 'Update minimum weight for rewards',
-  registerFeeShare: 'Register an address for fee sharing'
 };
 
 export const proposalActionTypeName = [
@@ -84,7 +82,6 @@ export const proposalActionTypeName = [
   'members',
   'distribute',
   'min weight',
-  'fee share',
   'text',
   'other',
 ] as const;
@@ -103,7 +100,6 @@ export const proposalActionShortName: Record<enterprise.ProposalActionType, Prop
   modify_multisig_membership: 'members',
   distribute_funds: 'distribute',
   update_minimum_weight_for_rewards: 'min weight',
-  register_fee_share: 'fee share'
 };
 
 export const getProposalActionType = (action: enterprise.ProposalAction): enterprise.ProposalActionType => {

diff --git a/apps/enterprise/src/pages/create-proposal/CreateProposalPageContent.tsx b/apps/enterprise/src/pages/create-proposal/CreateProposalPageContent.tsx
@@ -33,7 +33,6 @@ import { Center } from 'lib/ui/Center';
 import { Spinner } from 'lib/ui/Spinner';
 import { Text } from 'lib/ui/Text';
 import { CreateProposalProvider } from './CreateProposalProvider';
-import { RegisterFeeShareProposalPage } from './register-fee-share/RegisterFeeShareProposalPage';
 
 type CreateProposalPageParams = {
   type: ProposalType;
@@ -104,7 +103,6 @@ export const CreateProposalPageContent = () => {
                     undelegate={() => <UndelegateProposalForm />}
                     redelegate={() => <RedelegateProposalForm />}
                     minWeightForRewards={() => <MinimumWeightForRewardsProposalPage />}
-                    registerFeeShare={() => <RegisterFeeShareProposalPage />}
                   />
                 </CurrentDaoProvider>
               </Container>

diff --git a/apps/enterprise/src/pages/create-proposal/SelectProposalType.tsx b/apps/enterprise/src/pages/create-proposal/SelectProposalType.tsx
@@ -57,7 +57,6 @@ export const proposalDescription: Record<ProposalType, ReactNode> = {
   mintNft:
     'Mint a new DAO NFT to the specified addresses. This proposal will only work if the minter on the NFT contract is the DAO treasury address.',
   minWeightForRewards: 'Update the minimum weight required to receive rewards.',
-  registerFeeShare: 'Register a contract address that was created by the DAO for fee sharing.'
 };
 
 // TODO: turn into a reusable component

diff --git a/.../enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalForm.tsx b/.../enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalForm.tsx
diff --git a/.../enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalPage.tsx b/.../enterprise/src/pages/create-proposal/register-fee-share/RegisterFeeShareProposalPage.tsx
diff --git a/...enterprise/src/pages/create-proposal/register-fee-share/helpers/toRegisterFeeShareMsg.tsx b/...enterprise/src/pages/create-proposal/register-fee-share/helpers/toRegisterFeeShareMsg.tsx
diff --git a/apps/enterprise/src/pages/proposal/ProposalActions.tsx b/apps/enterprise/src/pages/proposal/ProposalActions.tsx
@@ -51,7 +51,6 @@ export const ProposalActions = () => {
                     <UpdateMultisigMembersAction />
                   </CurrentDAOMultisigMembersProvider>
                 )}
-                register_fee_share={() => null}
               />
             </CurrentProposalActionProvider>
           );

diff --git a/apps/enterprise/src/types/contracts/enterprise.ts b/apps/enterprise/src/types/contracts/enterprise.ts
@@ -157,8 +157,7 @@ export module enterprise {
     | 'execute_msgs'
     | 'modify_multisig_membership'
     | 'distribute_funds'
-    | 'update_minimum_weight_for_rewards'
-    | 'register_fee_share';
+    | 'update_minimum_weight_for_rewards';
   export type Binary = string;
   export interface CreateProposalMsg {
     /**