Skip to content

Commit

Permalink
Mobile: ASI Branding (#382)
Browse files Browse the repository at this point in the history
  • Loading branch information
sh-wallet authored Aug 21, 2024
1 parent 6ba9683 commit d56abbf
Show file tree
Hide file tree
Showing 32 changed files with 29 additions and 25 deletions.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Fetch Wallet</string>
<string name="app_name">ASI Alliance Wallet</string>
<string moduleConfig="true" name="CodePushDeploymentKey">KIjCGsvIA6HTRxeR5BN0gsemSrsNJfOICquOP</string>
<string name="appCenterAnalytics_whenToEnableAnalytics" moduleConfig="true" translatable="false">ALWAYS_SEND</string>
</resources>
8 changes: 4 additions & 4 deletions packages/mobile/app.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "mobile",
"displayName": "Fetch Wallet",
"displayName": "ASI Alliance Wallet",
"expo": {
"name": "Fetch Wallet",
"name": "ASI Alliance Wallet",
"slug": "FetchWallet",
"version": "1.0.0",
"orientation": "portrait",
Expand Down Expand Up @@ -38,13 +38,13 @@
[
"expo-camera",
{
"cameraPermission": "Allow Fetch Wallet to access your camera."
"cameraPermission": "Allow ASI Alliance Wallet to access your camera."
}
],
[
"expo-location",
{
"locationAlwaysAndWhenInUsePermission": "Allow Fetch Wallet to use your location."
"locationAlwaysAndWhenInUsePermission": "Allow ASI Alliance Wallet to use your location."
}
],
[
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/ios/mobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@
DEVELOPMENT_TEAM = T62N9GYJ92;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = mobile/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Fetch Wallet";
INFOPLIST_KEY_CFBundleDisplayName = "ASI Alliance Wallet";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -958,7 +958,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = T62N9GYJ92;
INFOPLIST_FILE = mobile/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Fetch Wallet";
INFOPLIST_KEY_CFBundleDisplayName = "ASI Alliance Wallet";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/mobile/ios/mobile/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Fetch Wallet</string>
<string>ASI Alliance Wallet</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconName</key>
Expand All @@ -15,7 +15,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Fetch Wallet</string>
<string>ASI Alliance Wallet</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
Binary file removed packages/mobile/src/assets/logo/brand-logo.png
Binary file not shown.
Binary file modified packages/mobile/src/assets/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/mobile/src/modals/ledger/ledger-selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const LedgerNanoBLESelector: FunctionComponent<{
"Cosmos"
);
setMainContent(
"Open Cosmos app on your ledger and pair with Fetch wallet"
"Open Cosmos app on your ledger and pair with ASI Alliance Wallet"
);
setBluetoothMode(BluetoothMode.Pairing);
setIsPairingText("Waiting to pair...");
Expand All @@ -71,7 +71,7 @@ export const LedgerNanoBLESelector: FunctionComponent<{
if (initErrorOn === LedgerInitErrorOn.App) {
setBluetoothMode(BluetoothMode.Device);
setMainContent(
"Open Cosmos app on your ledger and pair with Fetch wallet"
"Open Cosmos app on your ledger and pair with ASI Alliance Wallet"
);
setIsConnecting(false);
} else if (initErrorOn === LedgerInitErrorOn.Transport) {
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/src/screens/camera/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const CameraScreen: FunctionComponent = () => {
scannerBottomText={
route.params.recipientConfig
? "Send assets by scanning a QR code"
: "Send assets or connect to Fetch Wallet\nbrowser extension by scanning a QR code"
: "Send assets or connect to ASI Alliance Wallet\nbrowser extension by scanning a QR code"
}
barCodeScannerSettings={{
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
Expand Down
5 changes: 3 additions & 2 deletions packages/mobile/src/screens/delete-account/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ export const DeleteWalletScreen: FunctionComponent = () => {
<PageWithScrollView
backgroundMode="image"
contentContainerStyle={style.get("flex-grow-1")}
style={style.flatten(["padding-x-page", "padding-y-page"]) as ViewStyle}
style={style.flatten(["padding-x-page", "overflow-scroll"]) as ViewStyle}
>
<View style={style.flatten(["margin-x-30"]) as ViewStyle}>
<IconWithText
icon={<DeleteWalletIcon />}
title={"Delete wallet"}
subtitle={
"You will no longer have access to\nyour wallet on Fetch Wallet"
"You will no longer have access to\nyour wallet on ASI Alliance Wallet"
}
titleStyle={style.flatten(["h3", "font-normal"]) as ViewStyle}
subtitleStyle={style.flatten(["body3"]) as ViewStyle}
Expand Down Expand Up @@ -147,6 +147,7 @@ export const DeleteWalletScreen: FunctionComponent = () => {
containerStyle={style.flatten(["border-radius-32"]) as ViewStyle}
textStyle={style.flatten(["body2", "font-normal"]) as ViewStyle}
/>
<View style={style.flatten(["height-page-pad"]) as ViewStyle} />
<KeyboardSpacerView />
<PasswordInputModal
isOpen={isOpenModal}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/src/screens/register/end.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const RegisterEndScreen: FunctionComponent = observer(() => {
]) as ViewStyle
}
>
Your Fetch journey now begins.
Your ASI Alliance journey now begins.
</Text>
</View>
{password && keychainStore.isBiometrySupported ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const ImportFromExtensionScreen: FunctionComponent = () => {
}}
onBarCodeScanned={onBarCodeScanned}
scannerBottomText={
"Connect to Fetch Wallet\nbrowser extension by scanning a QR code"
"Connect to ASI Alliance Wallet\nbrowser extension by scanning a QR code"
}
isLoading={isLoading}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export const ImportFromExtensionIntroScreen: FunctionComponent = () => {
fadeDuration={0}
/>
}
title={"Import from Fetch extension"}
subtitle={`Import your account(s) by going to\n‘Settings > Link Fetch Mobile’ on Fetch Extension and scanning the QR Code`}
title={"Import from ASI Alliance Web extension"}
subtitle={`Import your account(s) by going to\n‘Settings > Link ASI Alliance Mobile’ on ASI Alliance Web Extension and scanning the QR Code`}
iconStyle={style.flatten(["margin-bottom-24"]) as ViewStyle}
titleStyle={
style.flatten([
Expand Down Expand Up @@ -140,7 +140,7 @@ export const ImportFromExtensionIntroScreen: FunctionComponent = () => {
}
buttonText={
modelStatus == ModelStatus.First
? "Allow Fetch to use camera"
? "Allow ASI Alliance to use camera"
: "Enable camera permission in settings"
}
isOpen={openCameraModel}
Expand Down
11 changes: 7 additions & 4 deletions packages/mobile/src/screens/register/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,15 @@ export const RegisterIntroScreen: FunctionComponent = () => {
]}
>
<View style={style.flatten(["justify-between"]) as ViewStyle}>
<View style={style.flatten(["margin-bottom-16"]) as ViewStyle}>
<View
style={
style.flatten(["margin-bottom-16", "justify-center"]) as ViewStyle
}
>
<View style={style.flatten(["items-center"]) as ViewStyle}>
<Image
source={require("assets/logo/logo.png")}
style={{
// height: 80,
aspectRatio: 2.977,
}}
resizeMode="contain"
Expand Down Expand Up @@ -179,7 +182,7 @@ export const RegisterIntroScreen: FunctionComponent = () => {
Welcome to your
</Text>
<LinearGradientText
text="Fetch Wallet"
text="ASI Alliance Wallet"
color1="#CF447B"
color2="#F9774B"
textCenter={false}
Expand Down Expand Up @@ -419,7 +422,7 @@ export const ImportExistingWalletModal: FunctionComponent<{
close={() => close()}
>
<TokenCardView
title="Import from Fetch extension"
title="Import from ASI Alliance Web extension"
leadingIcon={<FetchIcon size={30} />}
containerStyle={
style.flatten(["margin-bottom-6", "height-80"]) as ViewStyle
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/src/screens/setting/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const SettingScreen: FunctionComponent = observer(() => {
}}
/>
<SettingItem
label="Fetch Wallet version"
label="ASI Alliance Wallet version"
left={<BranchIcon size={16} />}
onPress={() => {
navigation.navigate("Setting", {
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/src/utils/import-from-extension/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export async function registerExportedKeyRingDatas(
continue;
}

const name = exportKeyRingData.meta["name"] || "Fetch Account";
const name = exportKeyRingData.meta["name"] || "ASI Alliance Account";
if (exportKeyRingData.type === "mnemonic") {
await registerConfig.createMnemonic(
name,
Expand Down

0 comments on commit d56abbf

Please sign in to comment.