Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.0.1 #1985

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Release 1.0.1 #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b15db0f
chore: update version to 1.0.1
Jasonvdb Jun 13, 2024
817ffbc
fix: removing exception trigger test
Jasonvdb Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ android {
applicationId "to.bitkit"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 111
versionName "1.0"
versionCode 126
versionName "1.0.1"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}
Expand Down
50 changes: 25 additions & 25 deletions e2e/settings.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,31 +613,31 @@ d('Settings', () => {
});
});

d('Dev Settings', () => {
it('Shows the crash error screen when triggering render error', async () => {
if (checkComplete('settings-dev')) {
return;
}

await element(by.id('Settings')).tap();
if (!__DEV__) {
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
}
await element(by.id('DevSettings')).tap();

// Error screen will not be rendered in development mode
if (__DEV__) {
markComplete('settings-dev');
return;
}

await element(by.id('TriggerRenderError')).tap();
await expect(element(by.id('ErrorClose'))).toBeVisible();
await expect(element(by.id('ErrorReport'))).toBeVisible();

markComplete('settings-dev');
});
});
// d('Dev Settings', () => {
// it('Shows the crash error screen when triggering render error', async () => {
// if (checkComplete('settings-dev')) {
// return;
// }

// await element(by.id('Settings')).tap();
// if (!__DEV__) {
// await element(by.id('DevOptions')).multiTap(5); // enable dev mode
// }
// await element(by.id('DevSettings')).tap();

// // Error screen will not be rendered in development mode
// if (__DEV__) {
// markComplete('settings-dev');
// return;
// }

// await element(by.id('TriggerRenderError')).tap();
// await expect(element(by.id('ErrorClose'))).toBeVisible();
// await expect(element(by.id('ErrorReport'))).toBeVisible();

// markComplete('settings-dev');
// });
// });

d('Support', () => {
it('Can see app status', async () => {
Expand Down
8 changes: 4 additions & 4 deletions ios/bitkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 126;
DEVELOPMENT_TEAM = KYH47R284B;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = bitkit/Info.plist;
Expand All @@ -528,7 +528,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -549,7 +549,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 111;
CURRENT_PROJECT_VERSION = 126;
DEVELOPMENT_TEAM = KYH47R284B;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = bitkit/Info.plist;
Expand All @@ -560,7 +560,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bitkit",
"author": "Synonym",
"version": "1.0.0-beta.111",
"version": "1.0.1",
"scripts": {
"start": "react-native start",
"android": "react-native run-android",
Expand Down
24 changes: 12 additions & 12 deletions src/screens/Settings/DevSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const DevSettings = ({
const dispatch = useAppDispatch();
const { t } = useTranslation('lightning');
const [showDialog, setShowDialog] = useState(false);
const [throwError, setThrowError] = useState(false);
// const [throwError, setThrowError] = useState(false);
const selectedWallet = useAppSelector(selectedWalletSelector);
const selectedNetwork = useAppSelector(selectedNetworkSelector);
const addressType = useAppSelector(addressTypeSelector);
Expand Down Expand Up @@ -162,14 +162,14 @@ const DevSettings = ({
refreshWallet({ selectedWallet, selectedNetwork }).then();
},
},
{
title: 'Trigger exception in React render',
type: EItemType.button,
testID: 'TriggerRenderError',
onPress: (): void => {
setThrowError(true);
},
},
// {
// title: 'Trigger exception in React render',
// type: EItemType.button,
// testID: 'TriggerRenderError',
// onPress: (): void => {
// setThrowError(true);
// },
// },
{
title: 'Trigger exception in action handler',
type: EItemType.button,
Expand Down Expand Up @@ -331,9 +331,9 @@ const DevSettings = ({
},
];

if (throwError) {
throw new Error('test render error');
}
// if (throwError) {
// throw new Error('test render error');
// }

return (
<>
Expand Down
Loading