diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml index 1409314b923..95c99740775 100644 --- a/.github/workflows/e2e-android.yml +++ b/.github/workflows/e2e-android.yml @@ -12,7 +12,7 @@ jobs: runs-on: - nscloud-ubuntu-22.04-amd64-16x64-with-cache - nscloud-cache-size-20gb - - nscloud-cache-tag-wallet-e2e-android + - nscloud-cache-tag-ms-runtime-e2e-android # We pay by the minute. # If it takes longer it usually fails, so no need to pay for more timeout-minutes: 25 @@ -50,6 +50,9 @@ jobs: yes | sdkmanager "platform-tools" "platforms;android-33" set -o pipefail + # Install Ninja + sudo apt-get install ninja-build + # Allow the emulator to use /dev/kvm sudo adduser $USER kvm sudo chown $USER /dev/kvm diff --git a/.github/workflows/e2e-pr.yml b/.github/workflows/e2e-pr.yml index 14893646fce..421fc24e1d1 100644 --- a/.github/workflows/e2e-pr.yml +++ b/.github/workflows/e2e-pr.yml @@ -19,6 +19,8 @@ jobs: android-api-level: 30 secrets: inherit ios: + # TODO re-enable after we're able to switch to Namespace for iOS + if: false name: iOS uses: ./.github/workflows/e2e-ios.yml with: diff --git a/e2e/scripts/check-e2e-wallet-balance.ts b/e2e/scripts/check-e2e-wallet-balance.ts index e78bb4dd3c6..626752c6fbc 100644 --- a/e2e/scripts/check-e2e-wallet-balance.ts +++ b/e2e/scripts/check-e2e-wallet-balance.ts @@ -1,11 +1,7 @@ -import { E2E_TEST_WALLET, E2E_TEST_WALLET_SECURE_SEND } from './consts' +import { E2E_TEST_WALLET } from './consts' import { checkBalance, getCeloTokensBalance } from './utils' ;(async () => { console.log(`E2E_TEST_WALLET: ${E2E_TEST_WALLET}`) console.table(await getCeloTokensBalance(E2E_TEST_WALLET)) await checkBalance(E2E_TEST_WALLET) - - console.log(`E2E_TEST_WALLET_SECURE_SEND: ${E2E_TEST_WALLET_SECURE_SEND}`) - console.table(await getCeloTokensBalance(E2E_TEST_WALLET_SECURE_SEND)) - await checkBalance(E2E_TEST_WALLET_SECURE_SEND) })() diff --git a/e2e/scripts/consts.ts b/e2e/scripts/consts.ts index 7fb65ff556f..b5cb001a41e 100644 --- a/e2e/scripts/consts.ts +++ b/e2e/scripts/consts.ts @@ -1,4 +1,4 @@ -export const E2E_TEST_WALLET = '0x6131a6d616a4be3737b38988847270a64bc10caa' -export const E2E_TEST_WALLET_SECURE_SEND = '0x86b8f44386cb2d457db79c3dab8cf42f9d8a3fc0' +export const E2E_TEST_WALLET = '0x3f4f42aC3a5A3c54454F9d00C27bCAFA78Cc6856' +export const E2E_TEST_WALLET_SECURE_SEND = '0x4971094C1cB186b5589E5709c83D28c264865925' export const E2E_TEST_FAUCET = '0xe5F5363e31351C38ac82DBAdeaD91Fd5a7B08846' export const REFILL_TOKENS = ['CELO', 'cUSD', 'cEUR'] diff --git a/e2e/src/HomeFeed.spec.js b/e2e/src/HomeFeed.spec.js index 39bb860decb..8042b727ca2 100644 --- a/e2e/src/HomeFeed.spec.js +++ b/e2e/src/HomeFeed.spec.js @@ -22,7 +22,9 @@ describe('Home Feed', () => { await expect(element(by.text(`$${amount}`)).atIndex(0)).toBeVisible() }) - it('should load more items on scroll', async () => { + // TODO(mobilestack): Un-skip once more items are in the feed. Currently + // there's not really a backlog so this will fail. + it.skip('should load more items on scroll', async () => { // Tap back button if present form previous test try { await element(by.id('BackChevron')).tap() diff --git a/e2e/src/usecases/NewAccountPhoneVerification.js b/e2e/src/usecases/NewAccountPhoneVerification.js index c9dde667b84..d324446b345 100644 --- a/e2e/src/usecases/NewAccountPhoneVerification.js +++ b/e2e/src/usecases/NewAccountPhoneVerification.js @@ -174,7 +174,8 @@ export default NewAccountPhoneVerification = () => { } // Assert correct content is visible on the phone verification screen - it('Then should have correct phone verification screen', async () => { + // TODO(mobilestack): Un-skip if CPV is enabled + it.skip('Then should have correct phone verification screen', async () => { await expect(element(by.id('PhoneVerificationHeader'))).toBeVisible() let skipAttributes = await element(by.text('Skip')).getAttributes() jestExpect(skipAttributes.enabled).toBe(true) diff --git a/e2e/src/usecases/SecureSend.js b/e2e/src/usecases/SecureSend.js index 57bff1561c4..79e5d3f71a1 100644 --- a/e2e/src/usecases/SecureSend.js +++ b/e2e/src/usecases/SecureSend.js @@ -20,7 +20,8 @@ const AMOUNT_TO_SEND = '0.01' const WALLET_FUNDING_MULTIPLIER = 2.2 export default SecureSend = () => { - describe('Secure send flow with phone number lookup', () => { + // TODO(mobilestack): Un-skip this if we ever support CPV + describe.skip('Secure send flow with phone number lookup', () => { beforeAll(async () => { // uninstall the app to remove secure send mapping await device.uninstallApp() diff --git a/e2e/src/usecases/Send.js b/e2e/src/usecases/Send.js index 88c868272cd..a7038a036b4 100644 --- a/e2e/src/usecases/Send.js +++ b/e2e/src/usecases/Send.js @@ -133,7 +133,11 @@ export default Send = () => { }) }) - describe('When multi-token send flow to phone number with one address', () => { + // TODO(mobilestack): Un-skip these if we ever support CPV. + // This is the ONLY place in tests where the centrally verified e2e account + // is used, so enabling these also means we'll need to add this account (SAMPLE_BACKUP_KEY_VERIFIED) + // back into the funding scripts. + describe.skip('When multi-token send flow to phone number with one address', () => { beforeAll(async () => { await device.uninstallApp() await device.installApp() diff --git a/e2e/src/usecases/Settings.js b/e2e/src/usecases/Settings.js index 4d3c37a2486..7639523263c 100644 --- a/e2e/src/usecases/Settings.js +++ b/e2e/src/usecases/Settings.js @@ -16,7 +16,8 @@ export default Settings = () => { await sleep(3000) }) - it('Edit Profile Name', async () => { + // mobilestack: no profile support + it.skip('Edit Profile Name', async () => { let randomName = faker.lorem.words() await navigateToProfile() await element(by.id('ProfileSubmenu/EditProfile')).tap() diff --git a/e2e/src/usecases/WalletConnectV2.js b/e2e/src/usecases/WalletConnectV2.js index 7e6623366dc..a773349c32f 100644 --- a/e2e/src/usecases/WalletConnectV2.js +++ b/e2e/src/usecases/WalletConnectV2.js @@ -20,7 +20,7 @@ import jestExpect from 'expect' const dappName = 'WalletConnectV2 E2E' const walletAddress = ( - process.env.E2E_WALLET_ADDRESS || '0x6131a6d616a4be3737b38988847270a64bc10caa' + process.env.E2E_WALLET_ADDRESS || '0x3f4f42aC3a5A3c54454F9d00C27bCAFA78Cc6856' ).toLowerCase() const client = createPublicClient({ diff --git a/e2e/src/utils/consts.js b/e2e/src/utils/consts.js index 0ed6e417b45..46b82c5c02e 100644 --- a/e2e/src/utils/consts.js +++ b/e2e/src/utils/consts.js @@ -1,12 +1,12 @@ export const DEFAULT_RECIPIENT_ADDRESS = '0xe5F5363e31351C38ac82DBAdeaD91Fd5a7B08846' export const SAMPLE_BACKUP_KEY = - 'general debate dial flock want basket local machine effort monitor stomach purity attend brand extend salon obscure soul open floor useful like cause exhaust' + 'industry almost clinic kitchen garage vibrant episode credit solution blanket repair whisper height autumn elevator abstract viable gate girl sadness price process hard ready' export const SAMPLE_PRIVATE_KEY = // corresponds to backup key above - '0x34c78f42ec153668070bd55c0d237adcdfee0359f1ea473b8e16c8d5f99be14a' -export const SAMPLE_WALLET_ADDRESS = '0x6131a6d616a4be3737b38988847270a64bc10caa' // corresponds to the backup key above + '0x81f25dc705a953868e172e155ef02ecdf4e0b950af91918d0dd13fb5f586945c' +export const SAMPLE_WALLET_ADDRESS = '0x3f4f42ac3a5a3c54454f9d00c27bcafa78cc6856' // corresponds to the backup key above export const SAMPLE_BACKUP_KEY_VERIFIED = - 'embody siege middle glory soda solar nasty report swap now never any' -export const SAMPLE_WALLET_ADDRESS_VERIFIED = '0x86b8f44386cb2d457db79c3dab8cf42f9d8a3fc0' // corresponds to the backup key above + 'call broccoli practice engage private amused seek sure barely horn oyster try farm nest victory cloth pilot sense return glad wrist toilet device upset' +export const SAMPLE_WALLET_ADDRESS_VERIFIED = '0x4971094C1cB186b5589E5709c83D28c264865925' // corresponds to the backup key above export const SAMPLE_BACKUP_KEY_VERIFIED_2 = 'bench album relax truth pond orchard diet unaware cloud tackle twin tongue' export const SAMPLE_WALLET_ADDRESS_VERIFIED_2 = '0x5fe1407f47b1310ff232a8d368b36099eff61604' // corresponds to the backup key above diff --git a/renovate.json5 b/renovate.json5 index 8a42126c4fa..8491e8b2dc5 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -3,7 +3,7 @@ // Deps updates will be handled from the wallet repo and synced here // to avoid conflicts and duplicated PRs enabled: false, - + extends: ['github>valora-inc/renovate-config:default.json5', ':disableDigestUpdates'], // Restrict semantic commit type to "chore"