From 9fea501e4ef372cdf0e7db7fa70a7258d5110206 Mon Sep 17 00:00:00 2001
From: nicolas <nicosampler@users.noreply.github.com>
Date: Fri, 30 Oct 2020 16:40:03 -0300
Subject: [PATCH 1/3] Remove request app from rinkeby (#1545)

---
 src/routes/safe/components/Apps/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/safe/components/Apps/utils.ts b/src/routes/safe/components/Apps/utils.ts
index f26bfff4..75c1b881 100644
--- a/src/routes/safe/components/Apps/utils.ts
+++ b/src/routes/safe/components/Apps/utils.ts
@@ -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
   {

From cd8dc8d486788b8c6457c96e1804aa06a2898cd0 Mon Sep 17 00:00:00 2001
From: Agustin Pane <agustin.pane@gmail.com>
Date: Mon, 2 Nov 2020 09:27:49 -0300
Subject: [PATCH 2/3] Uses orderedNFTAssets (#1546)

Co-authored-by: Daniel Sanchez <daniel.sanchez@gnosis.pm>
---
 src/logic/collectibles/store/selectors/index.ts            | 6 +++++-
 src/routes/safe/components/Balances/Collectibles/index.tsx | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/logic/collectibles/store/selectors/index.ts b/src/logic/collectibles/store/selectors/index.ts
index e8940dcc..1c5e6412 100644
--- a/src/logic/collectibles/store/selectors/index.ts
+++ b/src/logic/collectibles/store/selectors/index.ts
@@ -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,
diff --git a/src/routes/safe/components/Balances/Collectibles/index.tsx b/src/routes/safe/components/Balances/Collectibles/index.tsx
index fa2185da..14efee7b 100644
--- a/src/routes/safe/components/Balances/Collectibles/index.tsx
+++ b/src/routes/safe/components/Balances/Collectibles/index.tsx
@@ -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()
 

From aa5be55414e01cf782f12940c963134704a4acf7 Mon Sep 17 00:00:00 2001
From: Mati Dastugue <matias.dastugue@altoros.com>
Date: Mon, 2 Nov 2020 15:24:13 -0300
Subject: [PATCH 3/3] xDai - Disable Wallets (#1563)

* Disable not working wallets for xDai
---
 src/config/networks/xdai.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/config/networks/xdai.ts b/src/config/networks/xdai.ts
index dee4c790..ef24b4fe 100644
--- a/src/config/networks/xdai.ts
+++ b/src/config/networks/xdai.ts
@@ -38,7 +38,18 @@ const xDai: NetworkConfig = {
   },
   disabledWallets:[
     WALLETS.TREZOR,
-    WALLETS.LEDGER
+    WALLETS.LEDGER,
+    WALLETS.COINBASE,
+    WALLETS.DAPPER,
+    WALLETS.FORTMATIC,
+    WALLETS.OPERA,
+    WALLETS.OPERA_TOUCH,
+    WALLETS.TORUS,
+    WALLETS.TRUST,
+    WALLETS.UNILOGIN,
+    WALLETS.WALLET_CONNECT,
+    WALLETS.WALLET_LINK,
+    WALLETS.AUTHEREUM
   ]
 }