fix: rebase and modif timeout for crypto org

libs/coin-modules/coin-cosmos/src/specs.ts

@@ -604,6 +604,7 @@ const cryptoOrg = {
   ...generateGenericCosmosTest("crypto_org", false, {
     minViableAmount: cryptoOrgMinimalTransactionAmount,
     mutations: cosmosLikeMutations(cryptoOrgMinimalTransactionAmount),
+    testTimeout: 4 * 60 * 1000,
     skipOperationHistory: true,
   }),
 };

libs/ledger-live-common/src/generated/bridge/js.ts

@@ -1,6 +1,5 @@
 import casper from "../../families/casper/bridge/js";
 import celo from "../../families/celo/bridge/js";
-import crypto_org from "../../families/crypto_org/bridge/js";
 import { bridge as algorand } from "../../families/algorand/setup";
 import { bridge as bitcoin } from "../../families/bitcoin/setup";
 import { bridge as cardano } from "../../families/cardano/setup";
@@ -25,11 +24,6 @@ import { bridge as xrp } from "../../families/xrp/setup";
 export default {
   casper,
   celo,
-<<<<<<< HEAD
-  crypto_org,
-=======
-  internet_computer,
->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module)
   algorand,
   bitcoin,
   cardano,

libs/ledger-live-common/src/generated/deviceTransactionConfig.ts

@@ -1,6 +1,5 @@
 import casper from "../families/casper/deviceTransactionConfig";
 import celo from "../families/celo/deviceTransactionConfig";
-import crypto_org from "../families/crypto_org/deviceTransactionConfig";
 import algorand from "@ledgerhq/coin-algorand/deviceTransactionConfig";
 import bitcoin from "@ledgerhq/coin-bitcoin/deviceTransactionConfig";
 import cardano from "@ledgerhq/coin-cardano/deviceTransactionConfig";
@@ -24,11 +23,6 @@ import xrp from "@ledgerhq/coin-xrp/deviceTransactionConfig";
 export default {
   casper,
   celo,
-<<<<<<< HEAD
-  crypto_org,
-=======
-  internet_computer,
->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module)
   algorand,
   bitcoin,
   cardano,

libs/ledger-live-common/src/generated/hw-getAddress.ts

@@ -1,6 +1,5 @@
 import casper from "../families/casper/hw-getAddress";
 import celo from "../families/celo/hw-getAddress";
-import crypto_org from "../families/crypto_org/hw-getAddress";
 import { resolver as algorand } from "../families/algorand/setup";
 import { resolver as bitcoin } from "../families/bitcoin/setup";
 import { resolver as cardano } from "../families/cardano/setup";
@@ -25,11 +24,6 @@ import { resolver as xrp } from "../families/xrp/setup";
 export default {
   casper,
   celo,
-<<<<<<< HEAD
-  crypto_org,
-=======
-  internet_computer,
->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module)
   algorand,
   bitcoin,
   cardano,

libs/ledger-live-common/src/generated/specs.ts

@@ -1,6 +1,5 @@
 import casper from "../families/casper/specs";
 import celo from "../families/celo/specs";
-import crypto_org from "../families/crypto_org/specs";
 import algorand from "@ledgerhq/coin-algorand/specs";
 import bitcoin from "@ledgerhq/coin-bitcoin/specs";
 import cardano from "@ledgerhq/coin-cardano/specs";
@@ -25,11 +24,6 @@ import xrp from "@ledgerhq/coin-xrp/specs";
 export default {
   casper,
   celo,
-<<<<<<< HEAD
-  crypto_org,
-=======
-  internet_computer,
->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module)
   algorand,
   bitcoin,
   cardano,

libs/ledger-live-common/src/generated/transaction.ts

@@ -1,6 +1,5 @@
 import casper from "../families/casper/transaction";
 import celo from "../families/celo/transaction";
-import crypto_org from "../families/crypto_org/transaction";
 import algorand from "@ledgerhq/coin-algorand/transaction";
 import bitcoin from "@ledgerhq/coin-bitcoin/transaction";
 import cardano from "@ledgerhq/coin-cardano/transaction";
@@ -25,11 +24,6 @@ import xrp from "@ledgerhq/coin-xrp/transaction";
 export default {
   casper,
   celo,
-<<<<<<< HEAD
-  crypto_org,
-=======
-  internet_computer,
->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module)
   algorand,
   bitcoin,
   cardano,