status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of github.com:gnosis/safe-react into development

This commit is contained in:
Mati Dastugue 2020-11-02 13:57:01 -03:00
parent b1c53f8876 cd8dc8d486
commit 97f3e523b1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/logic/collectibles/store/selectors/index.ts
View File

@ -1,5 +1,5 @@
import { createSelector } from 'reselect'
import { NFTAsset, NFTAssets, NFTTokens } from 'src/logic/collectibles/sources/collectibles.d'
import { NFTAsset, NFTAssets, NFTToken, NFTTokens } from 'src/logic/collectibles/sources/collectibles.d'
import { AppReduxState } from 'src/store'
import { NFT_ASSETS_REDUCER_ID, NFT_TOKENS_REDUCER_ID } from 'src/logic/collectibles/store/reducer/collectibles'
@ -20,6 +20,10 @@ export const availableNftAssetsAddresses = createSelector(nftTokensSelector, (us
return Array.from(new Set(userNftTokens.map((nftToken) => nftToken.assetAddress)))
})
export const orderedNFTAssets = createSelector(nftTokensSelector, (userNftTokens): NFTToken[] =>
userNftTokens.sort((a, b) => a.name.localeCompare(b.name)),
)
export const activeNftAssetsListSelector = createSelector(
nftAssetsListSelector,
safeActiveAssetsSelector,

2
src/routes/safe/components/Apps/utils.ts
View File

@ -53,7 +53,7 @@ export const staticAppsList: Array<{ url: string; disabled: boolean; networks: n
{
url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmTBBaiDQyGa17DJ7DdviyHbc51fTVgf6Z5PW5w2YUTkgR`,
disabled: false,
networks: [ETHEREUM_NETWORK.MAINNET, ETHEREUM_NETWORK.RINKEBY],
networks: [ETHEREUM_NETWORK.MAINNET],
},
// Sablier
{

4
src/routes/safe/components/Balances/Collectibles/index.tsx
View File

@ -6,7 +6,7 @@ import { useSelector } from 'react-redux'
import Item from './components/Item'
import Paragraph from 'src/components/layout/Paragraph'
import { activeNftAssetsListSelector, nftTokensSelector } from 'src/logic/collectibles/store/selectors'
import { activeNftAssetsListSelector, orderedNFTAssets } from 'src/logic/collectibles/store/selectors'
import SendModal from 'src/routes/safe/components/Balances/SendModal'
import { fontColor, lg, screenSm, screenXs } from 'src/theme/variables'
import { useAnalytics, SAFE_NAVIGATION_EVENT } from 'src/utils/googleAnalytics'
@ -81,7 +81,7 @@ const Collectibles = (): React.ReactElement => {
const classes = useStyles()
const [selectedToken, setSelectedToken] = React.useState<NFTToken | undefined>()
const [sendNFTsModalOpen, setSendNFTsModalOpen] = React.useState(false)
const nftTokens = useSelector(nftTokensSelector)
const nftTokens = useSelector(orderedNFTAssets)
const activeAssetsList = useSelector(activeNftAssetsListSelector)
const { trackEvent } = useAnalytics()