Merge remote-tracking branch 'origin/issue-1753' into upgrade-ui

Koniverse · Sep 16, 2024 · 03e768c · 03e768c
2 parents cdc5841 + 1b8951a
commit 03e768c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-internal.yml b/.github/workflows/build-internal.yml
@@ -47,12 +47,14 @@ jobs:
 
     - name: Use Node.js 18
       uses: actions/setup-node@v4
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         node-version: 18
         cache: 'yarn'
 
     - name: Cache Yarn dependencies
       uses: actions/cache@v3
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       id: yarn-cache # optional, but allows referencing the step
       with:
         path: |
@@ -67,6 +69,7 @@ jobs:
 
     - name: Restore Pods Cache
       uses: actions/cache@v3
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         path: |
           ios/Pods
@@ -134,7 +137,6 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.GH_PAT }}
-
     - name: Remove unused web-runner for Android
       run: |
         rm -r ./html/OldWeb.bundle
@@ -158,12 +160,14 @@ jobs:
 
     - name: Use Node.js 18
       uses: actions/setup-node@v4
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         node-version: 18
         cache: 'yarn'
 
     - name: Cache Yarn dependencies
       uses: actions/cache@v3
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       id: yarn-cache # optional, but allows referencing the step
       with:
         path: |
@@ -179,12 +183,14 @@ jobs:
 
     - name: Cache Gradle Wrapper
       uses: actions/cache@v3
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         path: ~/.gradle/wrapper
         key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
     - name: Cache Gradle Dependencies
       uses: actions/cache@v3
+      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-caches-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

diff --git a/src/AppNavigator.tsx b/src/AppNavigator.tsx
@@ -415,7 +415,6 @@ const AppNavigator = ({ isAppReady }: Props) => {
           const splitItem = item.split('=');
           urlQueryMap[splitItem[0]] = splitItem[1];
         });
-        console.log('urlQueryMap', urlQueryMap);
 
         if (urlQuery.startsWith('wc')) {
           const accountByAddress = findAccountByAddress(accounts, urlQueryMap.address);

diff --git a/src/components/Modal/Earning/EarningValidatorSelector/index.tsx b/src/components/Modal/Earning/EarningValidatorSelector/index.tsx
@@ -371,7 +371,6 @@ export const EarningValidatorSelector = forwardRef(
         const key = getValidatorKey(item.address, item.identity);
         const selected = changeValidators.includes(key);
         const nominated = nominatorValueList.includes(key);
-        console.log(selected, selected);
 
         return (
           <StakingValidatorItem

diff --git a/src/hooks/screen/Transaction/useSelectValidators.ts b/src/hooks/screen/Transaction/useSelectValidators.ts
@@ -20,11 +20,9 @@ export function useSelectValidators(
   const [selected, setSelected] = useState<string[]>([]);
   // Current chosen in modal
   const [changeValidators, setChangeValidators] = useState<string[]>([]);
-  console.log('changeValidators', changeValidators);
 
   const onChangeSelectedValidator = useCallback(
     (changeVal: string) => {
-      console.log('changeVal', changeVal);
       setChangeValidators(currentChangeValidators => {
         let result: string[];
 
@@ -72,7 +70,6 @@ export function useSelectValidators(
           }
         }
 
-        console.log('result', result);
         return result;
       });
     },

diff --git a/src/hooks/static-content/useHandleAppPopupMap.ts b/src/hooks/static-content/useHandleAppPopupMap.ts
@@ -44,7 +44,6 @@ export const useHandleAppPopupMap = () => {
 
   const filteredDataByLocation = useMemo(() => {
     return appPopupData.filter(({ locations }) => {
-      console.log('locations', locations);
       if (locations && locations.length) {
         const countryId = getCountry();
         const locationIds = locations.map(item => item.split('_')[1]);