Merge branches 'feat/unable-to-activate-pending-accounts-when-bic-neg…

…ative' and 'develop-iota2.0' of github.com:iotaledger/firefly into feat/unable-to-activate-pending-accounts-when-bic-negative

packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts

@@ -14,7 +14,6 @@ export function getNetworkIdFromNetworkName(networkName: string): NetworkId {
  case 'testnet-1':
  case 'testnet-2':
  case 'docker':
- case 'docker-1709894432':
  case 'docker-1711022286':
  return NetworkId.Testnet
  default:

packages/shared/lib/core/wallet/actions/mintNft.ts

@@ -7,7 +7,7 @@ import {
  IIrc27Metadata,
 } from '@core/nfts'
 import { Converter } from '@core/utils'
-import { Bech32Address, MetadataFeature, MintNftParams, OutputType } from '@iota/sdk/out/types'
+import { MetadataFeature, MintNftParams, OutputType } from '@iota/sdk/out/types'
 import { ActivityAction } from '../enums'
 import {
  addActivityToWalletActivitiesInAllWalletActivities,
@@ -19,20 +19,13 @@ import { NftActivity } from '../types'
 import { getDefaultTransactionOptions, preprocessOutgoingTransaction } from '../utils'
 import { generateSingleNftActivity } from '../utils/generateActivity/generateSingleNftActivity'
 
-// TODO: Update this temporary interface when fixed in the SDK, linked issue https://github.com/iotaledger/firefly/issues/8134
-interface MintNftParamsTemp {
- issuer: Bech32Address
- address: Bech32Address
- immutableMetadata: MetadataFeature
-}
-
 export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promise<void> {
  try {
  const wallet = getSelectedWallet()
  updateSelectedWallet({ isTransferring: true })
 
  if (!wallet) return
- const mintNftParams: MintNftParamsTemp = {
+ const mintNftParams: MintNftParams = {
  issuer: wallet.depositAddress,
  address: wallet.depositAddress,
  immutableMetadata: new MetadataFeature({