fix: schema migrations and omit empty transactions (#2739)

* fix: schema migrations from 1.36.1

* fix: omit empty transaction from redux store

android/app/build.gradle

@@ -166,7 +166,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.37.0"
+        versionName "1.37.1"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/gradle.properties

@@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias
 
 # Setting this manually based on version number until we have this deploying via Cloud Build
 # Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
-VERSION_CODE=1021071621
+VERSION_CODE=1021071622
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn

ios/celo.xcodeproj/project.pbxproj

@@ -1282,7 +1282,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 103;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
@@ -1301,7 +1301,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 1.37.0;
+				MARKETING_VERSION = 1.37.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1328,7 +1328,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 103;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1341,7 +1341,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 1.37.0;
+				MARKETING_VERSION = 1.37.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valora/wallet",
-  "version": "1.37.0",
+  "version": "1.37.1",
   "author": "Celo",
   "license": "Apache-2.0",
   "private": true,

src/redux/migrations.test.ts

@@ -31,7 +31,8 @@ import {
   v56Schema,
   v57Schema,
   v58Schema,
-  v61Schema,
+  v59Schema,
+  v62Schema,
   v7Schema,
   v8Schema,
   vNeg1Schema,
@@ -597,9 +598,52 @@ describe('Redux persist migrations', () => {
   })
 
   it('works for v58 to v59', () => {
-    const oldSchema = v58Schema
+    const oldTransactions = [
+      {
+        metadata: {
+          title: null,
+          comment: '',
+          subtitle: null,
+          image: null,
+        },
+        __typename: 'TokenTransferV2',
+        block: '14255636',
+        transactionHash: '0xf4e59db43c9051947ffe8a29a09c8f85dcf540699855166aa68f11cda3014b72',
+        type: 'RECEIVED',
+        amount: {
+          value: '0.01',
+          tokenAddress: '0x765de816845861e75a25fca122bb6898b8b1282a',
+          localAmount: {
+            currencyCode: 'USD',
+            exchangeRate: '1',
+            value: '0.01',
+          },
+        },
+        fees: null,
+        timestamp: 1658945996000,
+        address: '0xde33e71faecdead20e6a8af8f362d2236cba005f',
+      },
+      {},
+    ]
+    const oldSchema = {
+      ...v58Schema,
+      transactions: {
+        ...v58Schema.transactions,
+        transactions: oldTransactions,
+      },
+    }
     const migratedSchema = migrations[59](oldSchema)
 
+    const expectedSchema: any = _.cloneDeep(oldSchema)
+    expectedSchema.transactions.transactions = [oldTransactions[0]]
+
+    expect(migratedSchema).toMatchObject(expectedSchema)
+  })
+
+  it('works for v59 to v60', () => {
+    const oldSchema = v59Schema
+    const migratedSchema = migrations[60](oldSchema)
+
     const expectedSchema: any = _.cloneDeep(oldSchema)
     expectedSchema.fiatConnect = {}
     expectedSchema.fiatConnect.quotes = []
@@ -609,9 +653,9 @@ describe('Redux persist migrations', () => {
     expect(migratedSchema).toMatchObject(expectedSchema)
   })
 
-  it('works for v61 to v62', () => {
-    const oldSchema = v61Schema
-    const migratedSchema = migrations[62](oldSchema)
+  it('works for v62 to v63', () => {
+    const oldSchema = v62Schema
+    const migratedSchema = migrations[63](oldSchema)
 
     const expectedSchema: any = _.cloneDeep(oldSchema)
     expectedSchema.app.superchargeTokenConfigByToken = {}

src/redux/migrations.ts

@@ -13,6 +13,7 @@ import { REMOTE_CONFIG_VALUES_DEFAULTS } from 'src/firebase/remoteConfigValuesDe
 import { AddressToDisplayNameType } from 'src/identity/reducer'
 import { VerificationStatus } from 'src/identity/types'
 import { PaymentDeepLinkHandler } from 'src/merchantPayment/types'
+import { TokenTransaction } from 'src/transactions/types'
 import { Currency } from 'src/utils/currencies'
 
 export const migrations = {
@@ -694,35 +695,44 @@ export const migrations = {
     },
   }),
   59: (state: any) => ({
+    ...state,
+    transactions: {
+      ...state.transactions,
+      transactions: (state.transactions.transactions || []).filter(
+        (transaction: TokenTransaction) => Object.keys(transaction).length > 0
+      ),
+    },
+  }),
+  60: (state: any) => ({
     ...state,
     fiatConnect: {
       quotes: [],
       quotesLoading: false,
       quotesError: null,
     },
   }),
-  60: (state: any) => ({
+  61: (state: any) => ({
     ...state,
     app: {
       ...state.app,
       showSwapMenuInDrawerMenu: REMOTE_CONFIG_VALUES_DEFAULTS.showSwapMenuInDrawerMenu,
     },
   }),
-  61: (state: any) => ({
+  62: (state: any) => ({
     ...state,
     fiatConnect: {
       ...state.fiatConnect,
       transfer: null,
     },
   }),
-  62: (state: any) => ({
+  63: (state: any) => ({
     ...state,
     app: {
       ..._.omit(state.app, 'superchargeTokens'),
       superchargeTokenConfigByToken: {},
     },
   }),
-  63: (state: any) => ({
+  64: (state: any) => ({
     ...state,
     fiatConnect: {
       ...state.fiatConnect,

src/redux/store.test.ts

@@ -93,7 +93,7 @@ describe('store state', () => {
       Object {
         "_persist": Object {
           "rehydrated": true,
-          "version": 63,
+          "version": 64,
         },
         "account": Object {
           "acceptedTerms": false,

src/redux/store.ts

@@ -23,7 +23,7 @@ const persistConfig: PersistConfig<RootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-inc/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 63,
+  version: 64,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
   blacklist: ['networkInfo', 'alert', 'imports', 'supercharge'],

src/transactions/feed/queryHelper.ts

@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash'
 import { useState } from 'react'
 import { useAsync } from 'react-async-hook'
 import { useTranslation } from 'react-i18next'
@@ -78,10 +79,13 @@ export function useFetchTransactions(): QueryHookResult {
 
     const returnedTransactions = result.data?.tokenTransactionsV2?.transactions
     if (returnedTransactions?.length) {
-      addTransactions(returnedTransactions)
+      const nonEmptyTransactions = returnedTransactions.filter(
+        (returnedTransaction) => !isEmpty(returnedTransaction)
+      )
+      addTransactions(nonEmptyTransactions)
       // We store non-paginated results in redux to show them to the users when they open the app.
       if (!paginatedResult) {
-        dispatch(updateTransactions(returnedTransactions))
+        dispatch(updateTransactions(nonEmptyTransactions))
       }
     }
 

test/schemas.ts

@@ -1385,11 +1385,6 @@ export const v59Schema = {
     ...v58Schema._persist,
     version: 59,
   },
-  fiatConnect: {
-    quotes: [],
-    quotesLoading: false,
-    quotesError: null,
-  },
 }
 
 export const v60Schema = {
@@ -1398,9 +1393,10 @@ export const v60Schema = {
     ...v59Schema._persist,
     version: 60,
   },
-  app: {
-    ...v59Schema.app,
-    showSwapMenuInDrawerMenu: false,
+  fiatConnect: {
+    quotes: [],
+    quotesLoading: false,
+    quotesError: null,
   },
 }
 
@@ -1410,9 +1406,9 @@ export const v61Schema = {
     ...v60Schema._persist,
     version: 61,
   },
-  fiatConnect: {
-    ...v60Schema.fiatConnect,
-    transfer: null,
+  app: {
+    ...v60Schema.app,
+    showSwapMenuInDrawerMenu: false,
   },
 }
 
@@ -1422,8 +1418,20 @@ export const v62Schema = {
     ...v61Schema._persist,
     version: 62,
   },
+  fiatConnect: {
+    ...v61Schema.fiatConnect,
+    transfer: null,
+  },
+}
+
+export const v63Schema = {
+  ...v62Schema,
+  _persist: {
+    ...v62Schema._persist,
+    version: 63,
+  },
   app: {
-    ..._.omit(v61Schema.app, 'superchargeTokens'),
+    ..._.omit(v62Schema.app, 'superchargeTokens'),
     superchargeTokenConfigByToken: {
       [mockCusdAddress]: {
         minBalance: 10,
@@ -1437,18 +1445,18 @@ export const v62Schema = {
   },
 }
 
-export const v63Schema = {
-  ...v62Schema,
+export const v64Schema = {
+  ...v63Schema,
   _persist: {
-    ...v62Schema._persist,
-    version: 63,
+    ...v63Schema._persist,
+    version: 64,
   },
   fiatConnect: {
-    ...v62Schema.fiatConnect,
+    ...v63Schema.fiatConnect,
     providers: null,
   },
 }
 
 export function getLatestSchema(): Partial<RootState> {
-  return v63Schema as Partial<RootState>
+  return v64Schema as Partial<RootState>
 }