Merge pull request #1466 from DA0-DA0/development

Deploy fixes

apps/dapp/package.json

@@ -33,7 +33,7 @@
     "@keplr-wallet/stores": "^0.11.49",
     "@keplr-wallet/types": "^0.11.49",
     "@mui/icons-material": "^5.10.3",
-    "@sentry/nextjs": "^7.7.0",
+    "@sentry/nextjs": "^7.80.0",
     "@types/formidable": "^2.0.5",
     "cors": "^2.8.5",
     "formidable": "^2.0.1",
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@dao-dao/config": "2.2.0",
     "@next/bundle-analyzer": "^12.1.0",
-    "@sentry/cli": "^2.5.0",
+    "@sentry/cli": "^2.21.3",
     "@solana/web3.js": "^1.75.0",
     "@types/cors": "^2.8.13",
     "@types/lodash.clonedeep": "^4.5.0",

apps/sda/package.json

@@ -30,7 +30,7 @@
     "@keplr-wallet/stores": "^0.11.49",
     "@keplr-wallet/types": "^0.11.49",
     "@mui/icons-material": "^5.10.3",
-    "@sentry/nextjs": "^7.7.0",
+    "@sentry/nextjs": "^7.80.0",
     "@types/formidable": "^2.0.5",
     "cors": "^2.8.5",
     "formidable": "^2.0.1",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@dao-dao/config": "2.2.0",
     "@next/bundle-analyzer": "^12.1.0",
-    "@sentry/cli": "^2.5.0",
+    "@sentry/cli": "^2.21.3",
     "@solana/web3.js": "^1.75.0",
     "@types/cors": "^2.8.13",
     "@types/lodash.clonedeep": "^4.5.0",

packages/i18n/locales/dog/translation.json

@@ -344,6 +344,7 @@
     "notificationsInInbox_other": "dere iz {{count}} open puppozalz in ur inbox",
     "numNftsSelected_one": "{{count}} nft seleckted",
     "numNftsSelected_other": "{{count}} nftz seleckted",
+    "numNftsSelected_zero": "nar nft seleckted",
     "numProposals_one": "{{count}} puppozal",
     "numProposals_other": "{{count}} puppozalz",
     "numSelected_one": "{{count}} seleckted",

packages/i18n/locales/en/translation.json

@@ -271,6 +271,7 @@
     "pencil": "Pencil",
     "people": "People",
     "pick": "Mining pick",
+    "printer": "Printer",
     "raisedHand": "Raised hand",
     "recycle": "Recycle",
     "robot": "Robot",
@@ -509,6 +510,7 @@
     "grantOrRevokeAuthz": "Grant or revoke authorization",
     "granteeAddress": "Grantee address",
     "granteeAddressTooltip": "The address you are granting or revoking to execute a message on behalf of the DAO.",
+    "howManyTokensCanTheyMint": "How many ${{tokenSymbol}} can they mint?",
     "iContributedPlaceholder": "I contributed...",
     "image": "Image",
     "imageUrlTooltip": "A link to an image. For example: https://moonphase.is/image.svg",
@@ -530,6 +532,7 @@
     "messageType": "Message type",
     "migrateDescription": "This will <1>migrate</1> the selected contract to a new code ID.",
     "migrateMessage": "Migrate message",
+    "minter": "Minter",
     "minterContract": "Minter contract",
     "minterContractMessage": "Minter contract message",
     "multipleChoiceDescription": "This allows proposals to contain multiple choices instead of just `Yes` and `No`.\n\n**CAUTION:** Using more features increases the risk to a DAO because there are more things that can go wrong. You can always enable this later.",
@@ -869,6 +872,7 @@
     "minimumOutputRequiredDescription_gov": "Before the proposal is passed and executed, the swap price will fluctuate. If the price drops and no longer satisfies this minimum output required, the swap will not occur.",
     "minimumOutputRequiredDescription_wallet": "The exact swap price will fluctuate during the transaction, but the minimum output amount is guaranteed. If the price drops and no longer satisfies this minimum output required, the swap will not occur.",
     "mintActionDescription": "Mint new governance tokens.",
+    "mintExplanation": "This action mints new tokens, increasing the token supply. With great power comes great responsibility; be careful! If you have an active threshold set, this may lock the DAO.",
     "mintNftDescription": "Create a new NFT.",
     "mustViewAllActionPagesBeforeVoting": "You must view all action pages before voting.",
     "name": "Name",
@@ -912,6 +916,7 @@
     "numContributors_other": "{{count}} contributors",
     "numNftsSelected_one": "{{count}} NFT selected",
     "numNftsSelected_other": "{{count}} NFTs selected",
+    "numNftsSelected_zero": "No NFT selected",
     "numPayments_one": "{{count}} payment",
     "numPayments_other": "{{count}} payments",
     "numProposals_one": "{{count}} proposal",
@@ -1027,8 +1032,7 @@
     "token_one": "token",
     "token_other": "tokens",
     "tokens": "tokens",
-    "tokensWillBeSentToTreasury_dao": "These tokens will be sent to the DAO's treasury.",
-    "tokensWillBeSentToTreasury_wallet": "These tokens will be sent to your wallet.",
+    "tokensWillBeSentToTreasury": "These tokens will be sent to the DAO's treasury.",
     "tokensWillBeSplitAmongContributors": "{{tokens}} will be split among contributors.",
     "tos": "DAO DAO TOOLING IS PROVIDED \"AS IS\", AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND. No developer or entity involved in creating the DAO DAO UI or smart contracts will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of DAO DAO tooling, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.",
     "totalHoldings": "Total holdings",
@@ -1055,6 +1059,8 @@
     },
     "updateContractAdminActionDescription": "Update the CosmWasm level admin of a smart contract.",
     "updateInfoActionDescription": "Update your DAO's name, image, and description.",
+    "updateMinterAllowanceDescription": "Allow an account to mint tokens, or remove the allowance.",
+    "updateMinterAllowanceExplanation": "This action is needed to allow an account to mint tokens.",
     "updatePostDescription": "Update a post on the DAO's press.",
     "updateProposalSubmissionConfigActionDescription": "Update the proposal submission paramaters for your DAO.",
     "updateVotingConfigActionDescription": "Update the voting parameters for your DAO.",
@@ -1473,6 +1479,7 @@
     "upcoming": "Upcoming",
     "updateContractAdmin": "Update Contract Admin",
     "updateInfo": "Update Info",
+    "updateMinterAllowance": "Update Minter Allowance",
     "updatePost": "Update Post",
     "upgradeToV2": "Upgrade to V2",
     "validatorActions": "Validator Actions",

packages/state/recoil/atoms/index.ts

@@ -1,6 +1,7 @@
 export * from './chain'
 export * from './loading'
 export * from './misc'
+export * from './nft'
 export * from './proposals'
 export * from './refresh'
 export * from './theme'

packages/state/recoil/atoms/nft.ts

@@ -0,0 +1,12 @@
+import { atom } from 'recoil'
+
+import { NftCardInfo } from '@dao-dao/types'
+
+// Cache NFT card info per key once loaded so they can be accessed anywhere
+// after lazy load.
+export const nftCardInfosForKeyAtom = atom<
+  Record<string, NftCardInfo | undefined>
+>({
+  key: 'nftCardInfosForKey',
+  default: {},
+})

packages/stateful/actions/core/nfts/BurnNft/Component.stories.tsx

@@ -1,12 +1,16 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react'
 
-import { makeProps as makeNftCardProps } from '@dao-dao/stateless/components/NftCard.stories'
+import {
+  makeLazyInfo,
+  makeProps as makeNftCardProps,
+} from '@dao-dao/stateless/components/NftCard.stories'
 import {
   ReactHookFormDecorator,
   makeDaoInfo,
   makeDaoProvidersDecorator,
 } from '@dao-dao/storybook'
 
+import { NftSelectionModal } from '../../../../components'
 import { BurnNft } from './Component'
 
 export default {
@@ -45,11 +49,12 @@ Default.args = {
       errored: false,
       data: [
         selected,
-        makeNftCardProps(),
-        makeNftCardProps(),
-        makeNftCardProps(),
-        makeNftCardProps(),
+        makeLazyInfo(),
+        makeLazyInfo(),
+        makeLazyInfo(),
+        makeLazyInfo(),
       ],
     },
+    NftSelectionModal,
   },
 }

packages/stateful/actions/core/nfts/BurnNft/Component.tsx

@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { useEffect, useState } from 'react'
+import { ComponentType, useEffect, useState } from 'react'
 import { useFormContext } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
@@ -8,13 +8,15 @@ import {
   HorizontalNftCard,
   InputErrorMessage,
   Loader,
-  NftSelectionModal,
 } from '@dao-dao/stateless'
 import {
   ActionComponent,
+  LazyNftCardInfo,
   LoadingDataWithError,
   NftCardInfo,
+  NftSelectionModalProps,
 } from '@dao-dao/types'
+import { getNftKey } from '@dao-dao/utils'
 
 export type BurnNftData = {
   chainId: string
@@ -24,16 +26,17 @@ export type BurnNftData = {
 
 export interface BurnNftOptions {
   // The set of NFTs that may be burned as part of this action.
-  options: LoadingDataWithError<NftCardInfo[]>
+  options: LoadingDataWithError<LazyNftCardInfo[]>
   // Information about the NFT currently selected. If errored, it may be burnt.
   nftInfo: LoadingDataWithError<NftCardInfo | undefined>
+  NftSelectionModal: ComponentType<NftSelectionModalProps>
 }
 
 export const BurnNft: ActionComponent<BurnNftOptions> = ({
   fieldNamePrefix,
   isCreating,
   errors,
-  options: { options, nftInfo },
+  options: { options, nftInfo, NftSelectionModal },
 }) => {
   const { t } = useTranslation()
   const { watch, setValue, setError, clearErrors } =
@@ -43,17 +46,15 @@ export const BurnNft: ActionComponent<BurnNftOptions> = ({
   const tokenId = watch((fieldNamePrefix + 'tokenId') as 'tokenId')
   const collection = watch((fieldNamePrefix + 'collection') as 'collection')
 
-  const selected = `${chainId}:${collection}:${tokenId}`
-  const getIdForNft = (nft: NftCardInfo) =>
-    `${nft.chainId}:${nft.collection.address}:${nft.tokenId}`
+  const selectedKey = getNftKey(chainId, collection, tokenId)
 
   useEffect(() => {
     if (
-      !selected ||
+      !selectedKey ||
       // If selected, make sure it exists in options.
       (!options.loading &&
         !options.errored &&
-        !options.data.some((nft) => getIdForNft(nft) === selected))
+        !options.data.some((nft) => nft.key === selectedKey))
     ) {
       if (!errors?.collection) {
         setError((fieldNamePrefix + 'collection') as 'collection', {
@@ -67,7 +68,7 @@ export const BurnNft: ActionComponent<BurnNftOptions> = ({
       }
     }
   }, [
-    selected,
+    selectedKey,
     setError,
     clearErrors,
     t,
@@ -77,7 +78,9 @@ export const BurnNft: ActionComponent<BurnNftOptions> = ({
   ])
 
   // Show modal initially if creating and no NFT already selected.
-  const [showModal, setShowModal] = useState<boolean>(isCreating && !selected)
+  const [showModal, setShowModal] = useState<boolean>(
+    isCreating && !selectedKey
+  )
 
   return (
     <>
@@ -119,27 +122,26 @@ export const BurnNft: ActionComponent<BurnNftOptions> = ({
             label: t('button.save'),
             onClick: () => setShowModal(false),
           }}
-          getIdForNft={getIdForNft}
           header={{
             title: t('title.selectNftToBurn'),
           }}
           nfts={options}
           onClose={() => setShowModal(false)}
           onNftClick={(nft) => {
-            if (getIdForNft(nft) === selected) {
-              // No need to clear chain when deselecting.
+            if (nft.key === selectedKey) {
+              setValue((fieldNamePrefix + 'chainId') as 'chainId', '')
               setValue((fieldNamePrefix + 'tokenId') as 'tokenId', '')
               setValue((fieldNamePrefix + 'collection') as 'collection', '')
             } else {
               setValue((fieldNamePrefix + 'chainId') as 'chainId', nft.chainId)
               setValue((fieldNamePrefix + 'tokenId') as 'tokenId', nft.tokenId)
               setValue(
                 (fieldNamePrefix + 'collection') as 'collection',
-                nft.collection.address
+                nft.collectionAddress
               )
             }
           }}
-          selectedIds={selected ? [selected] : []}
+          selectedKeys={selectedKey ? [selectedKey] : []}
           visible={showModal}
         />
       )}

packages/stateful/actions/core/nfts/BurnNft/index.tsx

@@ -8,8 +8,8 @@ import {
   ActionContextType,
   ActionKey,
   ActionMaker,
+  LazyNftCardInfo,
   LoadingDataWithError,
-  NftCardInfo,
   UseDecodedCosmosMsg,
   UseDefaults,
   UseTransformToCosmos,
@@ -22,15 +22,22 @@ import {
   objectMatchesStructure,
 } from '@dao-dao/utils'
 
+import { NftSelectionModal } from '../../../../components'
 import {
+  lazyNftCardInfosForDaoSelector,
   nftCardInfoSelector,
-  nftCardInfosForDaoSelector,
-  walletNftCardInfos,
+  walletLazyNftCardInfosSelector,
 } from '../../../../recoil/selectors/nft'
 import { useCw721CommonGovernanceTokenInfoIfExists } from '../../../../voting-module-adapter'
 import { useActionOptions } from '../../../react'
 import { BurnNft, BurnNftData } from './Component'
 
+const useDefaults: UseDefaults<BurnNftData> = () => ({
+  chainId: '',
+  collection: '',
+  tokenId: '',
+})
+
 const useTransformToCosmos: UseTransformToCosmos<BurnNftData> = () => {
   const {
     chain: { chain_id: currentChainId },
@@ -114,11 +121,11 @@ const Component: ActionComponent = (props) => {
   const options = useCachedLoadingWithError(
     props.isCreating
       ? context.type === ActionContextType.Wallet
-        ? walletNftCardInfos({
+        ? walletLazyNftCardInfosSelector({
             walletAddress: address,
             chainId: currentChainId,
           })
-        : nftCardInfosForDaoSelector({
+        : lazyNftCardInfosForDaoSelector({
             chainId: currentChainId,
             coreAddress: address,
             governanceCollectionAddress,
@@ -136,7 +143,7 @@ const Component: ActionComponent = (props) => {
       ? options
       : combineLoadingDataWithErrors(
           ...Object.values(options.data).filter(
-            (data): data is LoadingDataWithError<NftCardInfo[]> => !!data
+            (data): data is LoadingDataWithError<LazyNftCardInfo[]> => !!data
           )
         )
 
@@ -146,21 +153,13 @@ const Component: ActionComponent = (props) => {
       options={{
         options: allChainOptions,
         nftInfo,
+        NftSelectionModal,
       }}
     />
   )
 }
 
-export const makeBurnNftAction: ActionMaker<BurnNftData> = ({
-  t,
-  chain: { chain_id: chainId },
-}) => {
-  const useDefaults: UseDefaults<BurnNftData> = () => ({
-    chainId,
-    collection: '',
-    tokenId: '',
-  })
-
+export const makeBurnNftAction: ActionMaker<BurnNftData> = ({ t }) => {
   return {
     key: ActionKey.BurnNft,
     Icon: FireEmoji,

packages/stateful/actions/core/nfts/MintNft/MintNft.tsx

@@ -81,10 +81,8 @@ export const MintNft: ActionComponent = (props) => {
       ? undefined
       : {
           key: chainId + collectionAddress + mintMsg.token_id,
-          collection: {
-            address: collectionAddress,
-            name: creatingCollectionInfoLoading.data?.name ?? '',
-          },
+          collectionAddress,
+          collectionName: creatingCollectionInfoLoading.data?.name ?? '',
           tokenId: mintMsg.token_id,
           imageUrl: creatingNftTokenUriDataLoading.data.imageUrl,
           name: creatingNftTokenUriDataLoading.data.name ?? '',