Fix: null -> undefined in Transaction types (#81)

* Fix: name and logoUri in AddressEx can be undefined, not null

* Bump version

* Bump major version

* Fix tests

Author: katspaugh

e2e/propose-transaction.test.ts

@@ -21,7 +21,6 @@ describe('proposeTransaction tests', () => {
       refundReceiver: '0x0000000000000000000000000000000000000000',
       safeTxHash: '0x98798b6d9400b25397e85eb79c444a06f93d153555c1d7fd026176f02055a824',
       sender: '0x474e5Ded6b5D078163BFB8F6dBa355C3aA5478C8',
-      origin: null,
     })
     await expect(req).rejects.toThrow(
       '1337: {"nonFieldErrors":["Contract-transaction-hash=0xdf2c4db07ee705e94135d92f835cc241b1d4c20e10d481a4e445265851448cb3 does not match provided contract-tx-hash=0x98798b6d9400b25397e85eb79c444a06f93d153555c1d7fd026176f02055a824"]}',

e2e/safe-collectibles-list.test.ts

@@ -12,8 +12,8 @@ describe('getCollectibles tests', () => {
 
     expect(data.length).toBeGreaterThanOrEqual(1)
     expect(typeof data[1].address).toBe('string')
-    expect(typeof data[0].description).toBe('string')
-    expect(typeof data[0].name).toBe('string')
+    expect(data[0].description).toBeDefined()
+    expect(data[0].name).toBeDefined()
     expect(data[0].metadata).toBeDefined()
     expect(data[0].tokenName.length).toBeGreaterThan(0)
     expect(data[0].tokenSymbol.length).toBeGreaterThan(0)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/safe-react-gateway-sdk",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "main": "dist/index.min.js",
   "types": "dist/index.d.ts",
   "files": [

src/types/common.ts

@@ -2,8 +2,8 @@ import { IncomingTransfer, ModuleTransaction, MultisigTransaction, Page } from '
 
 export type AddressEx = {
   value: string
-  name: string | null
-  logoUri: string | null
+  name?: string
+  logoUri?: string
 }
 
 export type SafeInfo = {
@@ -13,7 +13,7 @@ export type SafeInfo = {
   threshold: number
   owners: AddressEx[]
   implementation: AddressEx
-  modules: AddressEx[]
+  modules: AddressEx[] | null
   guard: AddressEx | null
   fallbackHandler: AddressEx
   version: string

src/types/transactions.ts

@@ -10,9 +10,9 @@ export enum Operation {
 export type InternalTransaction = {
   operation: Operation
   to: string
-  value: string | null
-  data: string | null
-  dataDecoded: DataDecoded | null
+  value?: string
+  data?: string
+  dataDecoded?: DataDecoded
 }
 
 export type ValueDecodedType = InternalTransaction[]
@@ -21,12 +21,12 @@ export type Parameter = {
   name: string
   type: string
   value: ParamValue
-  valueDecoded: ValueDecodedType | null
+  valueDecoded?: ValueDecodedType
 }
 
 export type DataDecoded = {
   method: string
-  parameters: Parameter[] | null
+  parameters?: Parameter[]
 }
 
 export enum TransactionStatus {
@@ -67,20 +67,20 @@ export enum SettingsInfoType {
 export type Erc20Transfer = {
   type: TransactionTokenType.ERC20
   tokenAddress: string
-  tokenName: string | null
-  tokenSymbol: string | null
-  logoUri: string | null
-  decimals: number | null
+  tokenName?: string
+  tokenSymbol?: string
+  logoUri?: string
+  decimals?: number
   value: string
 }
 
 export type Erc721Transfer = {
   type: TransactionTokenType.ERC721
   tokenAddress: string
   tokenId: string
-  tokenName: string | null
-  tokenSymbol: string | null
-  logoUri: string | null
+  tokenName?: string
+  tokenSymbol?: string
+  logoUri?: string
 }
 
 export type NativeCoinTransfer = {
@@ -165,16 +165,16 @@ export type SettingsInfo =
 export type SettingsChange = {
   type: 'SettingsChange'
   dataDecoded: DataDecoded
-  settingsInfo: SettingsInfo | null
+  settingsInfo?: SettingsInfo
 }
 
 export interface Custom {
   type: 'Custom'
   to: AddressEx
   dataSize: string
   value: string
-  methodName: string | null
-  actionCount: number | null
+  methodName?: string
+  actionCount?: number
   isCancellation: boolean
 }
 
@@ -196,8 +196,8 @@ export type Creation = {
   type: 'Creation'
   creator: AddressEx
   transactionHash: string
-  implementation: AddressEx | null
-  factory: AddressEx | null
+  implementation?: AddressEx
+  factory?: AddressEx
 }
 
 export type TransactionInfo = Transfer | SettingsChange | Custom | MultiSend | Cancellation | Creation
@@ -212,7 +212,7 @@ export type MultisigExecutionInfo = {
   nonce: number
   confirmationsRequired: number
   confirmationsSubmitted: number
-  missingSigners: AddressEx[] | null
+  missingSigners?: AddressEx[]
 }
 
 export type ExecutionInfo = ModuleExecutionInfo | MultisigExecutionInfo
@@ -290,18 +290,18 @@ export type TransactionListPage = Page<TransactionListItem>
 export type MultisigTransactionRequest = {
   to: string
   value: string
-  data: string | null
+  data?: string
   nonce: string
   operation: Operation
   safeTxGas: string
   baseGas: string
   gasPrice: string
   gasToken: string
-  refundReceiver: string | null
+  refundReceiver?: string
   safeTxHash: string
   sender: string
-  signature?: string | null
-  origin: string | null
+  signature?: string
+  origin?: string
 }
 
 /* Transaction details types */
@@ -312,12 +312,12 @@ export type SafeAppInfo = {
 }
 
 export type TransactionData = {
-  hexData: string | null
-  dataDecoded: DataDecoded | null
+  hexData?: string
+  dataDecoded?: DataDecoded
   to: AddressEx
-  value: string | null
+  value?: string
   operation: Operation
-  addressInfoIndex: { [key: string]: AddressEx } | null
+  addressInfoIndex?: { [key: string]: AddressEx }
   trustedDelegateCallTarget: boolean
 }
 
@@ -328,7 +328,7 @@ export type ModuleExecutionDetails = {
 
 export type MultisigConfirmation = {
   signer: AddressEx
-  signature: string | null
+  signature?: string
   submittedAt: number
 }
 
@@ -342,25 +342,25 @@ export type MultisigExecutionDetails = {
   gasToken: string
   refundReceiver: AddressEx
   safeTxHash: string
-  executor: AddressEx | null
+  executor?: AddressEx
   signers: AddressEx[]
   confirmationsRequired: number
   confirmations: MultisigConfirmation[]
-  rejectors: AddressEx[] | null
-  gasTokenInfo: TokenInfo | null
+  rejectors?: AddressEx[]
+  gasTokenInfo?: TokenInfo
 }
 
 export type DetailedExecutionInfo = ModuleExecutionDetails | MultisigExecutionDetails
 
 export type TransactionDetails = {
   txId: string
-  executedAt: number | null
+  executedAt?: number
   txStatus: TransactionStatus
   txInfo: TransactionInfo
-  txData: TransactionData | null
-  detailedExecutionInfo: DetailedExecutionInfo | null
-  txHash: string | null
-  safeAppInfo: SafeAppInfo | null
+  txData?: TransactionData
+  detailedExecutionInfo?: DetailedExecutionInfo
+  txHash?: string
+  safeAppInfo?: SafeAppInfo
 }
 
 /* Transaction details types end */