Backmerge Release v2.16.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "2.15.1",
+  "version": "2.16.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {
@@ -182,7 +182,7 @@
     "async-sema": "^3.1.0",
     "axios": "0.21.0",
     "bignumber.js": "9.0.1",
-    "bnc-onboard": "1.15.0",
+    "bnc-onboard": "1.14.0",
     "classnames": "^2.2.6",
     "concurrently": "^5.3.0",
     "connected-react-router": "6.8.0",

public/electron.js

@@ -85,7 +85,7 @@ function getOpenedWindow(url, options) {
 function createWindow(port = DEFAULT_PORT) {
   mainWindow = new BrowserWindow({
     show: false,
-    width: 1024,
+    width: 1366,
     height: 768,
     webPreferences: {
       preload: path.join(__dirname, '../scripts/preload.js'),

src/config/networks/volta.ts

@@ -42,6 +42,8 @@ const mainnet: NetworkConfig = {
     },
   },
   disabledWallets: [
+    WALLETS.TREZOR,
+    WALLETS.LEDGER,
     WALLETS.COINBASE,
     WALLETS.DAPPER,
     WALLETS.FORTMATIC,

src/index.tsx

@@ -23,7 +23,7 @@ Sentry.init({
   dsn: SENTRY_DSN,
   release: `safe-react@${process.env.REACT_APP_APP_VERSION}`,
   integrations: [new Integrations.BrowserTracing()],
-  sampleRate: 1,
+  sampleRate: 0.2,
 })
 
 const root = document.getElementById('root')

src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.tsx

@@ -63,12 +63,14 @@ export const EllipsisTransactionDetails = ({
       <div className={classes.container} role="menu" tabIndex={0}>
         <MoreHorizIcon onClick={handleClick} onKeyDown={handleClick} />
         <Menu anchorEl={anchorEl} id="simple-menu" keepMounted onClose={closeMenuHandler} open={Boolean(anchorEl)}>
-          {sendModalOpenHandler ? (
-            <>
-              <MenuItem onClick={sendModalOpenHandler}>Send Again</MenuItem>
-              <Divider />
-            </>
-          ) : null}
+          {sendModalOpenHandler
+            ? [
+                <MenuItem key="send-again-button" onClick={sendModalOpenHandler}>
+                  Send Again
+                </MenuItem>,
+                <Divider key="divider" />,
+              ]
+            : null}
           {knownAddress ? (
             <MenuItem onClick={addOrEditEntryHandler}>Edit Address book Entry</MenuItem>
           ) : (

src/routes/safe/components/Apps/components/AppsList.tsx

@@ -107,7 +107,7 @@ const AppsList = (): React.ReactElement => {
           color="secondary"
           iconSize="sm"
           iconType="info"
-          text="These are third-party apps, which means they are not owned, controlled, maintained or audited by Gnosis. Interacting with the apps is at your own risk."
+          text="These are third-party apps, which means they are not owned, controlled, maintained or audited by Gnosis. Interacting with the apps is at your own risk. Any communication within the Apps is for informational purposes only and must not be construed as investment advice to engage in any transaction."
           textSize="sm"
         />
       </ContentWrapper>

src/routes/safe/components/Apps/utils.ts

@@ -64,7 +64,7 @@ export const staticAppsList: Array<StaticAppInfo> = [
   },
   // Sablier
   {
-    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmfLqzEHz5TEupRLPuFp7prtcVAm6hKii5YZsVZWeM17Lr`,
+    url: `${process.env.REACT_APP_IPFS_GATEWAY}/Qmb1Xpfu9mnX4A3trpoVeBZ9sTiNtEuRoFKEiaVXWntDxB`,
     disabled: false,
     networks: [ETHEREUM_NETWORK.MAINNET, ETHEREUM_NETWORK.RINKEBY],
   },
@@ -88,7 +88,7 @@ export const staticAppsList: Array<StaticAppInfo> = [
   },
   // TX-Builder
   {
-    url: `${gnosisAppsUrl}/tx-builder`,
+    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmXdrr9hRbXSaqMb71iKnEp66PwwsAbJDR9XdwByUYSTxB`,
     disabled: false,
     networks: [
       ETHEREUM_NETWORK.MAINNET,
@@ -100,7 +100,7 @@ export const staticAppsList: Array<StaticAppInfo> = [
   },
   // Wallet-Connect
   {
-    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmVWjxqMYuqZ4WvxKdrErcTt1Sx5JHxZosjYz9zHiHRAiq`,
+    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmWwSuByB3B3hLU5ita3RQgiSEDYtBr5LjjDCRGb8YqLKF`,
     disabled: false,
     networks: [
       ETHEREUM_NETWORK.MAINNET,

src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/index.tsx

@@ -45,7 +45,9 @@ const TxDescription = ({ tx }: { tx: Transaction }): React.ReactElement => {
       {tx.type === TransactionTypes.SETTINGS && <SettingsDescriptionTx tx={tx} />}
       {tx.type === TransactionTypes.CUSTOM && <CustomDescriptionTx tx={tx} />}
       {tx.type === TransactionTypes.UPGRADE && <UpgradeDescriptionTx tx={tx} />}
-      {[TransactionTypes.TOKEN, TransactionTypes.COLLECTIBLE].includes(tx.type) && <TransferDescriptionTx tx={tx} />}
+      {[TransactionTypes.TOKEN, TransactionTypes.COLLECTIBLE, TransactionTypes.OUTGOING].includes(tx.type) && (
+        <TransferDescriptionTx tx={tx} />
+      )}
     </Block>
   )
 }