Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--reorg-port…

…folio-balance' into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
MetaMask · Oct 17, 2024 · 8cb67f7 · 8cb67f7
2 parents c0a28bc + 2934811
commit 8cb67f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.detoxrc.js b/.detoxrc.js
@@ -26,7 +26,7 @@ module.exports = {
   configurations: {
     'ios.sim.apiSpecs': {
       device: 'ios.simulator',
-      app: 'ios.qa',
+      app: process.env.CI ? 'ios.qa' :'ios.debug',
       testRunner: {
         args: {
           "$0": "node e2e/api-specs/run-api-spec-tests.js",

diff --git a/app/components/Views/AccountConnect/AccountConnect.tsx b/app/components/Views/AccountConnect/AccountConnect.tsx
@@ -121,7 +121,6 @@ const AccountConnect = (props: AccountConnectProps) => {
   const accountsLength = useSelector(selectAccountsLength);
   const { wc2Metadata } = useSelector((state: RootState) => state.sdk);
 
-  const isOriginWalletConnect = wc2Metadata?.id && wc2Metadata?.id.length > 0;
   const { origin: channelIdOrHostname } = hostInfo.metadata as {
     id: string;
     origin: string;
@@ -141,6 +140,8 @@ const AccountConnect = (props: AccountConnectProps) => {
 
   const isOriginMMSDKRemoteConn = sdkConnection !== undefined;
 
+  const isOriginWalletConnect = !isOriginMMSDKRemoteConn && wc2Metadata?.id && wc2Metadata?.id.length > 0;
+
   const dappIconUrl = sdkConnection?.originatorInfo?.icon;
   const dappUrl = sdkConnection?.originatorInfo?.url ?? '';
 

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
@@ -40,8 +40,8 @@ ENV BUNDLE_PATH=/home/node/.bundle
 ENV HOME=/home/node
 # distro rbenv and ruby are out of date - install rbenv from git and manage ruby
 # RUBY_BUILD_VERSION=v20240501
-ARG RBENV_COMMIT=c3ba994ec2daccf4d160aea7f55dd5cc6fc873ef
-ARG RUBY_BUILD_COMMIT=263640c9fe1d44e6fc8f86fc56a67ee58e7b22f7
+ARG RBENV_COMMIT=3bac268cdb81dd745ce13a1cf6ff4a286336ab3b
+ARG RUBY_BUILD_COMMIT=aab1b8d0e7e814f200320749501ba57e2fae20d0
 RUN (mkdir /home/node/.rbenv \
     && curl -sL https://github.com/rbenv/rbenv/archive/${RBENV_COMMIT}.tar.gz \
     | tar --strip-components=1 -C /home/node/.rbenv/ -xzf - \