diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e53d13f0f..18d6fad9d 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -184,6 +184,19 @@ jobs: path: app/ios/xbuild/Build key: ${{ runner.os }}-dd-xcode + - name: Get Yarn cache directory path + id: yarn-cache-dir-path + run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT + + - name: Restore Yarn cache + uses: actions/cache@v4 + id: yarn-cache + with: + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + - name: Install dependencies working-directory: ./ run: | diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 9ebceb5c8..274db0657 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -15,22 +15,27 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: "3.11" - name: Setup NodeJS uses: ./.github/workflows/actions/setup-node - - name: Cache app node_modules - uses: actions/cache@v3 + - name: Get Yarn cache directory path + id: yarn-cache-dir-path + run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT + + - name: Restore Yarn cache + uses: actions/cache@v4 + id: yarn-cache with: - path: .yarn/cache - # Cache will be invalidated if yarn.lock changes - key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} - restore-keys: ${{ runner.os }}-yarn- + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- - name: Install dependencies working-directory: app - run: yarn install --immutable-cache + run: yarn install --immutable - name: Cache bcsc-core build output uses: actions/cache@v3 @@ -70,22 +75,27 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: "3.11" - name: Setup NodeJS uses: ./.github/workflows/actions/setup-node - - name: Cache app node_modules - uses: actions/cache@v3 + - name: Get Yarn cache directory path + id: yarn-cache-dir-path + run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT + + - name: Restore Yarn cache + uses: actions/cache@v4 + id: yarn-cache with: - path: .yarn/cache - # Cache will be invalidated if yarn.lock changes - key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} - restore-keys: ${{ runner.os }}-yarn- + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- - name: Install dependencies working-directory: app - run: yarn install --immutable-cache + run: yarn install --immutable - name: Automated testing run: yarn test diff --git a/app/App.tsx b/app/App.tsx index da1e87bf8..b5d58351d 100644 --- a/app/App.tsx +++ b/app/App.tsx @@ -68,7 +68,7 @@ const App = () => { - + diff --git a/app/ios/AriesBifold.xcodeproj/project.pbxproj b/app/ios/AriesBifold.xcodeproj/project.pbxproj index 7cbd6bc43..276ca2611 100644 --- a/app/ios/AriesBifold.xcodeproj/project.pbxproj +++ b/app/ios/AriesBifold.xcodeproj/project.pbxproj @@ -202,9 +202,9 @@ productReference = 00E356EE1AD99517003FC87E /* AriesBifoldTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* AriesBifold */ = { + 13B07F861A680F5B00A75B9A /* BCWallet */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AriesBifold" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "BCWallet" */; buildPhases = ( 4CEDB2CE40AFB66799F0C504 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, @@ -220,7 +220,7 @@ ); dependencies = ( ); - name = AriesBifold; + name = BCWallet; productName = AriesBifold; productReference = 13B07F961A680F5B00A75B9A /* BCWallet.app */; productType = "com.apple.product-type.application"; @@ -255,7 +255,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* AriesBifold */, + 13B07F861A680F5B00A75B9A /* BCWallet */, 00E356ED1AD99517003FC87E /* AriesBifoldTests */, ); }; @@ -470,7 +470,7 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* AriesBifold */; + target = 13B07F861A680F5B00A75B9A /* BCWallet */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -557,7 +557,7 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.BCWallet; - PRODUCT_NAME = BCWallet; + PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; @@ -595,8 +595,8 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.BCWallet; - PRODUCT_NAME = BCWallet; + PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.iddev.servicescard; + PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; @@ -756,7 +756,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AriesBifold" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "BCWallet" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, diff --git a/app/ios/AriesBifold.xcodeproj/xcshareddata/xcschemes/AriesBifold.xcscheme b/app/ios/AriesBifold.xcodeproj/xcshareddata/xcschemes/AriesBifold.xcscheme index bc517c677..05d5afce9 100644 --- a/app/ios/AriesBifold.xcodeproj/xcshareddata/xcschemes/AriesBifold.xcscheme +++ b/app/ios/AriesBifold.xcodeproj/xcshareddata/xcschemes/AriesBifold.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "BCWallet.app" - BlueprintName = "AriesBifold" + BlueprintName = "BCWallet" ReferencedContainer = "container:AriesBifold.xcodeproj"> @@ -56,7 +56,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "BCWallet.app" - BlueprintName = "AriesBifold" + BlueprintName = "BCWallet" ReferencedContainer = "container:AriesBifold.xcodeproj"> @@ -73,7 +73,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "BCWallet.app" - BlueprintName = "AriesBifold" + BlueprintName = "BCWallet" ReferencedContainer = "container:AriesBifold.xcodeproj"> diff --git a/app/ios/AriesBifold/Info.plist b/app/ios/AriesBifold/Info.plist index 5ecad104b..2e5913cf3 100644 --- a/app/ios/AriesBifold/Info.plist +++ b/app/ios/AriesBifold/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - BC Wallet + BC Services Card CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -69,7 +69,7 @@ NSFaceIDUsageDescription $(PRODUCT_NAME) wants to use your FaceID/TouchID to authenticate your identity NSLocationWhenInUseUsageDescription - We include this permission because a library our app uses references it, even though we don't use it directly + We include this permission because a library our app uses references it, even though we don't use it directly NSMicrophoneUsageDescription $(PRODUCT_NAME) needs access to your microphone to enable video calls UIAppFonts diff --git a/app/ios/GoogleService-Info.plist b/app/ios/GoogleService-Info.plist index 0d2b4e529..e4b0a7bc9 100644 --- a/app/ios/GoogleService-Info.plist +++ b/app/ios/GoogleService-Info.plist @@ -2,18 +2,22 @@ + CLIENT_ID + 27280337469-sandmglpe2viuf4p5u122tp4kc0hgqb7.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.27280337469-sandmglpe2viuf4p5u122tp4kc0hgqb7 API_KEY - AIzaSyCL37I5zpWEauPopROBm6d64bGDiimAvZE + AIzaSyBYE9-AFaGgXjS9wMXxkQcvR0gb-1L36ak GCM_SENDER_ID - 1008044298583 + 27280337469 PLIST_VERSION 1 BUNDLE_ID - ca.bc.gov.BCWallet + ca.bc.gov.iddev.servicescard PROJECT_ID - bc-wallet-mobile + bcsc-ios-app STORAGE_BUCKET - bc-wallet-mobile.appspot.com + bcsc-ios-app.appspot.com IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,6 +29,8 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:1008044298583:ios:76bfc02e8a3c04f844ae12 + 1:27280337469:ios:d17c95af9612ae764dd854 + DATABASE_URL + https://bcsc-ios-app.firebaseio.com \ No newline at end of file diff --git a/app/ios/Media.xcassets/AppIcon.appiconset/iTunesArtwork.png b/app/ios/Media.xcassets/AppIcon.appiconset/iTunesArtwork.png index 0643d71a4..3271b1c4a 100644 Binary files a/app/ios/Media.xcassets/AppIcon.appiconset/iTunesArtwork.png and b/app/ios/Media.xcassets/AppIcon.appiconset/iTunesArtwork.png differ diff --git a/app/src/store.tsx b/app/src/store.tsx index 57f0b7300..5d738abcf 100644 --- a/app/src/store.tsx +++ b/app/src/store.tsx @@ -246,7 +246,7 @@ export const initialState: BCState = { developer: developerState, dismissPersonCredentialOffer: dismissPersonCredentialOfferState, bcsc: bcscState, - mode: Mode.BCWallet, + mode: Mode.BCSC, } const bcReducer = (state: BCState, action: ReducerAction): BCState => { diff --git a/app/tsconfig.json b/app/tsconfig.json index af0acc83c..10c4c52a5 100644 --- a/app/tsconfig.json +++ b/app/tsconfig.json @@ -16,7 +16,8 @@ "@screens/*": ["src/screens/*"], "@services/*": ["src/services/*"], "@types/*": ["src/types/*"], - "@utils/*": ["src/utils/*"] + "@utils/*": ["src/utils/*"], + "react-native-bcsc-core": ["../packages/bcsc-core/src"] } }, "exclude": ["node_modules", "metro.config.js", "babel.config.js", "jest.config.js", "jestSetup.js"]