Merge pull request #1985 from gnosis/release/v3.1.0

Mergeback release v3.1.0 to development

.github/workflows/deploy-ewc.yml

@@ -111,7 +111,7 @@ jobs:
       # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/master'
-        run: aws s3 sync build s3://${{ secrets.STAGING_BUCKET_NAME }}/current/app --delete
+        run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete
 
       # Script to upload release files
       - run: bash ./scripts/github/deploy_release.sh

.github/workflows/deploy-mainnet.yml

@@ -92,7 +92,7 @@ jobs:
        # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/master' # Or refs/heads/main
-        run: aws s3 sync build s3://${{ secrets.STAGING_BUCKET_NAME }}/current/app --delete
+        run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete
 
       # Script to upload release files
       - run: bash ./scripts/github/deploy_release.sh

.github/workflows/deploy-rinkeby.yml

@@ -118,7 +118,7 @@ jobs:
       # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/master'
-        run: aws s3 sync build s3://${{ secrets.STAGING_BUCKET_NAME }}/current/app --delete
+        run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete
       
       # Script to upload release files
       - run: bash ./scripts/github/deploy_release.sh

.github/workflows/deploy-volta.yml

@@ -115,7 +115,7 @@ jobs:
       # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/master'
-        run: aws s3 sync build s3://${{ secrets.STAGING_BUCKET_NAME }}/current/app --delete
+        run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete
 
       # Script to upload release files
       - run: bash ./scripts/github/deploy_release.sh

.github/workflows/deploy-xdai.yml

@@ -114,7 +114,7 @@ jobs:
       # Script to deploy to staging environment
       - name: 'Deploy to S3: Staging'
         if: github.ref == 'refs/heads/master'
-        run: aws s3 sync build s3://${{ secrets.STAGING_BUCKET_NAME }}/current/app --delete
+        run: aws s3 sync build s3://${{ env.STAGING_BUCKET_NAME }}/current/app --delete
       
       # Script to upload release files
       - run: bash ./scripts/github/deploy_release.sh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {

src/logic/collectibles/sources/Gnosis.ts

@@ -36,10 +36,7 @@ class Gnosis {
 
     switch (tokens.status) {
       case 'fulfilled':
-        const {
-          data: { results = [] },
-        } = tokens.value
-        collectibles.erc721Tokens = results
+        collectibles.erc721Tokens = tokens.value.data || []
         break
       case 'rejected':
         console.error('no erc721 tokens for the current safe', tokens.reason)

src/logic/hooks/useEstimateTransactionGas.tsx

@@ -39,7 +39,11 @@ export const checkIfTxIsExecution = (
   txConfirmations?: number,
   txType?: string,
 ): boolean => {
-  if (threshold === 1 || sameString(txType, 'spendingLimit') || txConfirmations === threshold) {
+  if (
+    threshold === 1 ||
+    sameString(txType, 'spendingLimit') ||
+    (txConfirmations !== undefined && txConfirmations >= threshold)
+  ) {
     return true
   }
 

src/logic/tokens/api/fetchSafeCollectibles.ts

@@ -16,11 +16,9 @@ export type CollectibleResult = {
   uri: string | null
 }
 
-export const fetchSafeCollectibles = async (
-  safeAddress: string,
-): Promise<AxiosResponse<{ results: CollectibleResult[] }>> => {
+export const fetchSafeCollectibles = async (safeAddress: string): Promise<AxiosResponse<CollectibleResult[]>> => {
   const address = checksumAddress(safeAddress)
   const url = `${getSafeServiceBaseUrl(address)}/collectibles/`
 
-  return axios.get<CollectibleResult[], AxiosResponse<{ results: CollectibleResult[] }>>(url)
+  return axios.get<CollectibleResult[], AxiosResponse<CollectibleResult[]>>(url)
 }

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

@@ -71,13 +71,13 @@ export const staticAppsList: Array<StaticAppInfo> = [
   },
   // Lido finance
   {
-    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmYCzVxP4v8dX92d3nPvnxCksmsjdbKEPMzDHwudK2SALE`,
+    url: `${process.env.REACT_APP_IPFS_GATEWAY}/Qmde8dsa9r8bB59CNGww6LRiaZABuKaJfuzvu94hFkatJC`,
     disabled: false,
     networks: [ETHEREUM_NETWORK.MAINNET],
   },
   // Mushrooms finance
   {
-    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmdRLqtVW9nkjZmQiryoBfpvbqXrqYT59EawZcF5WXoLCY`,
+    url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmQs6CUbMUyKe3Sa3tU3HcnWWzsuCk8oJEk8CZKhRcJfEh`,
     disabled: false,
     networks: [ETHEREUM_NETWORK.MAINNET, ETHEREUM_NETWORK.RINKEBY],
   },

src/routes/safe/components/Transactions/GatewayTransactions/QueueTxList.tsx

@@ -82,12 +82,14 @@ export const QueueTxList = ({ transactions }: QueueTxListProps): ReactElement =>
   const title = txLocation === 'queued.next' ? 'NEXT TRANSACTION' : 'QUEUE'
 
   const { lastItemId, setLastItemId } = useContext(TxsInfiniteScrollContext)
+  if (transactions.length) {
     const [, lastTransactionsGroup] = transactions[transactions.length - 1]
     const lastTransaction = lastTransactionsGroup[lastTransactionsGroup.length - 1]
 
     if (txLocation === 'queued.queued' && !sameString(lastItemId, lastTransaction.id)) {
       setLastItemId(lastTransaction.id)
     }
+  }
 
   return (
     <StyledTransactionsGroup>

src/routes/safe/components/Transactions/GatewayTransactions/TxOwners.tsx

@@ -52,7 +52,7 @@ export const TxOwners = ({ detailedExecutionInfo }: TxOwnersProps): ReactElement
           </div>
         </OwnerListItem>
       ))}
-      {confirmationsNeeded === 0 ? (
+      {confirmationsNeeded <= 0 ? (
         <OwnerListItem>
           <span className="icon">
             <StyledImg alt="" src={detailedExecutionInfo.executor ? CheckCircleGreen : TransactionListActive} />

src/routes/safe/components/Transactions/GatewayTransactions/hooks/usePagedHistoryTransactions.ts

@@ -29,6 +29,7 @@ export const usePagedHistoryTransactions = (): PagedTransactions => {
 
     if (!results) {
       setHasMore(false)
+      setIsLoading(false)
       return
     }
 

src/routes/safe/components/Transactions/GatewayTransactions/hooks/useTransactionActions.ts

@@ -13,7 +13,7 @@ import { AppReduxState } from 'src/store'
 
 export const isThresholdReached = (executionInfo: ExecutionInfo): boolean => {
   const { confirmationsSubmitted, confirmationsRequired } = executionInfo
-  return confirmationsSubmitted === confirmationsRequired
+  return confirmationsSubmitted >= confirmationsRequired
 }
 
 export type TransactionActions = {